Mesa (master): st/mesa: handle new GLSL IR enumerants in switch statements

Brian Paul brianp at kemper.freedesktop.org
Fri Jan 25 22:48:26 UTC 2013


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

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 25 10:30:31 2013 -0700

st/mesa: handle new GLSL IR enumerants in switch statements

To silence warnings about unhandled cases.

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |   18 ++++++++++++++++--
 1 files changed, 16 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 643a9bb..c6ac634 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -984,6 +984,7 @@ type_size(const struct glsl_type *type)
        * at link time.
        */
       return 1;
+   case GLSL_TYPE_INTERFACE:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
       assert(!"Invalid type in type_size");
@@ -1934,10 +1935,23 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
       }
       break;
    }
+   case ir_unop_pack_snorm_2x16:
+   case ir_unop_pack_unorm_2x16:
+   case ir_unop_pack_half_2x16:
+   case ir_unop_pack_snorm_4x8:
+   case ir_unop_pack_unorm_4x8:
+   case ir_unop_unpack_snorm_2x16:
+   case ir_unop_unpack_unorm_2x16:
+   case ir_unop_unpack_half_2x16:
+   case ir_unop_unpack_half_2x16_split_x:
+   case ir_unop_unpack_half_2x16_split_y:
+   case ir_unop_unpack_snorm_4x8:
+   case ir_unop_unpack_unorm_4x8:
+   case ir_binop_pack_half_2x16_split:
    case ir_quadop_vector:
-      /* This operation should have already been handled.
+      /* This operation is not supported, or should have already been handled.
        */
-      assert(!"Should not get here.");
+      assert(!"Invalid ir opcode in glsl_to_tgsi_visitor::visit()");
       break;
    }
 




More information about the mesa-commit mailing list