Mesa (master): i965: Add gl_state_index casts for PATCH_VERTICES_IN

Jason Ekstrand jekstrand at kemper.freedesktop.org
Wed Feb 14 21:17:42 UTC 2018


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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Feb 13 14:56:28 2018 -0800

i965: Add gl_state_index casts for PATCH_VERTICES_IN

This fixes the build in clang

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105088
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
index 10a4ff40e5..69da83ad36 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@@ -254,7 +254,8 @@ brw_nir_lower_patch_vertices_in_to_uniform(nir_shader *nir)
       gl_state_index16 tokens[STATE_LENGTH] = {
          STATE_INTERNAL,
          nir->info.stage == MESA_SHADER_TESS_CTRL ?
-            STATE_TCS_PATCH_VERTICES_IN : STATE_TES_PATCH_VERTICES_IN,
+            (gl_state_index16)STATE_TCS_PATCH_VERTICES_IN :
+            (gl_state_index16)STATE_TES_PATCH_VERTICES_IN,
       };
       var->num_state_slots = 1;
       var->state_slots =




More information about the mesa-commit mailing list