Mesa (master): st/mesa: fix GLSL mix(.., .., bvecN)
Marek Olšák
mareko at kemper.freedesktop.org
Sun Sep 29 13:48:24 UTC 2013
Module: Mesa
Branch: master
Commit: 2bda5f3298154bab027aab6d4162b687ccdb36bd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2bda5f3298154bab027aab6d4162b687ccdb36bd
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Sep 23 22:43:23 2013 +0200
st/mesa: fix GLSL mix(.., .., bvecN)
v2: use CMP on drivers without native integer support
---
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 271cf05..53838b3 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -1944,6 +1944,14 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
/* note: we have to reorder the three args here */
emit(ir, TGSI_OPCODE_LRP, result_dst, op[2], op[1], op[0]);
break;
+ case ir_triop_csel:
+ if (this->ctx->Const.NativeIntegers)
+ emit(ir, TGSI_OPCODE_UCMP, result_dst, op[0], op[1], op[2]);
+ else {
+ op[0].negate = ~op[0].negate;
+ emit(ir, TGSI_OPCODE_CMP, result_dst, op[0], op[1], op[2]);
+ }
+ break;
case ir_unop_pack_snorm_2x16:
case ir_unop_pack_unorm_2x16:
case ir_unop_pack_half_2x16:
@@ -1970,7 +1978,6 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
case ir_binop_vector_extract:
case ir_triop_vector_insert:
case ir_binop_ldexp:
- case ir_triop_csel:
/* This operation is not supported, or should have already been handled.
*/
assert(!"Invalid ir opcode in glsl_to_tgsi_visitor::visit()");
More information about the mesa-commit
mailing list