Mesa (master): glsl_to_tgsi: remove bad assertion

Bryan Cain bryanc at kemper.freedesktop.org
Sat Jan 7 21:34:04 UTC 2012


Module: Mesa
Branch: master
Commit: c4529d10bed098b8d3d694f2a333f9afabbabbf9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4529d10bed098b8d3d694f2a333f9afabbabbf9

Author: Bryan Cain <bryancain3 at gmail.com>
Date:   Sat Jan  7 14:54:49 2012 -0600

glsl_to_tgsi: remove bad assertion

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 73d956e..ddd5366 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -1402,8 +1402,7 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
       }
       break;
    case ir_unop_neg:
-      assert(result_dst.type == GLSL_TYPE_FLOAT || result_dst.type == GLSL_TYPE_INT);
-      if (result_dst.type == GLSL_TYPE_INT)
+      if (result_dst.type == GLSL_TYPE_INT || result_dst.type == GLSL_TYPE_UINT)
          emit(ir, TGSI_OPCODE_INEG, result_dst, op[0]);
       else {
          op[0].negate = ~op[0].negate;




More information about the mesa-commit mailing list