From: Connor Abbott <cwabbott0@gmail.com>
Date: Mon, 2 Nov 2015 05:02:54 +0000 (-0500)
Subject: i965: fixup uniform setup for doubles
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76de7af8e22c7f7b174bca765f9f86a5beef963c;p=mesa.git

i965: fixup uniform setup for doubles

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
index 636340add35..15d99fa2738 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@@ -104,6 +104,11 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, nir_variable *var,
          unsigned vector_count = (MAX2(storage->array_elements, 1) *
                                   storage->type->matrix_columns);
          unsigned vector_size = storage->type->vector_elements;
+         unsigned max_vector_size = 4;
+         if (storage->type->base_type == GLSL_TYPE_DOUBLE) {
+            vector_size *= 2;
+            max_vector_size *= 2;
+         }
 
          for (unsigned s = 0; s < vector_count; s++) {
             unsigned i;
@@ -113,7 +118,7 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, nir_variable *var,
 
             if (!is_scalar) {
                /* Pad out with zeros if needed (only needed for vec4) */
-               for (; i < 4; i++) {
+               for (; i < max_vector_size; i++) {
                   static const gl_constant_value zero = { 0.0 };
                   stage_prog_data->param[uniform_index++] = &zero;
                }