Mesa (master): glsl: Silence warnings in the uniform initializer test about 16-bit types

Eric Anholt anholt at kemper.freedesktop.org
Wed Feb 21 04:25:44 UTC 2018


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

Author: Eric Anholt <eric at anholt.net>
Date:   Sat Feb 10 10:41:07 2018 +0000

glsl: Silence warnings in the uniform initializer test about 16-bit types

They should probably get unit tests implemented, but this cleans up a
bunch of warnings in my build for now.

Fixes: 59f458cd8703 ("glsl: Add 16-bit types")
Cc: Eduardo Lima Mitev <elima at igalia.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/compiler/glsl/tests/uniform_initializer_utils.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/compiler/glsl/tests/uniform_initializer_utils.cpp b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
index a1c68c8272..0d7fa26752 100644
--- a/src/compiler/glsl/tests/uniform_initializer_utils.cpp
+++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
@@ -110,6 +110,9 @@ generate_data_element(void *mem_ctx, const glsl_type *type,
       case GLSL_TYPE_INTERFACE:
       case GLSL_TYPE_SUBROUTINE:
       case GLSL_TYPE_FUNCTION:
+      case GLSL_TYPE_FLOAT16:
+      case GLSL_TYPE_UINT16:
+      case GLSL_TYPE_INT16:
 	 ASSERT_TRUE(false);
 	 break;
       }
@@ -150,6 +153,9 @@ generate_data_element(void *mem_ctx, const glsl_type *type,
       case GLSL_TYPE_INTERFACE:
       case GLSL_TYPE_SUBROUTINE:
       case GLSL_TYPE_FUNCTION:
+      case GLSL_TYPE_FLOAT16:
+      case GLSL_TYPE_UINT16:
+      case GLSL_TYPE_INT16:
 	 ASSERT_TRUE(false);
 	 break;
       }
@@ -278,6 +284,9 @@ verify_data(gl_constant_value *storage, unsigned storage_array_size,
 	 case GLSL_TYPE_INTERFACE:
 	 case GLSL_TYPE_SUBROUTINE:
          case GLSL_TYPE_FUNCTION:
+         case GLSL_TYPE_FLOAT16:
+         case GLSL_TYPE_UINT16:
+         case GLSL_TYPE_INT16:
 	    ASSERT_TRUE(false);
 	    break;
 	 }




More information about the mesa-commit mailing list