From 087f92c59a4d169f3912c621ea5a573a838d1be3 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 22 Apr 2019 09:52:24 -0700 Subject: [PATCH] i965: Tidy bogus indentation left by previous commit I left code indented one level too far in the previous commit to make the diff easier to review. Drop that extra level now. Fixes: 6981069fc80 i965: Ignore uniform storage for samplers or images, use binding info Reviewed-by: Jason Ekstrand --- .../drivers/dri/i965/brw_nir_uniforms.cpp | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 9252d30a557..e5f97b647af 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -180,34 +180,32 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, nir_variable *var, storage->type->is_image()) continue; - { - gl_constant_value *components = storage->storage; - 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 || - storage->type->base_type == GLSL_TYPE_UINT64 || - storage->type->base_type == GLSL_TYPE_INT64) { - vector_size *= 2; - if (vector_size > 4) - max_vector_size = 8; - } + gl_constant_value *components = storage->storage; + 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 || + storage->type->base_type == GLSL_TYPE_UINT64 || + storage->type->base_type == GLSL_TYPE_INT64) { + vector_size *= 2; + if (vector_size > 4) + max_vector_size = 8; + } - for (unsigned s = 0; s < vector_count; s++) { - unsigned i; - for (i = 0; i < vector_size; i++) { - uint32_t idx = components - prog->sh.data->UniformDataSlots; - stage_prog_data->param[uniform_index++] = BRW_PARAM_UNIFORM(idx); - components++; - } + for (unsigned s = 0; s < vector_count; s++) { + unsigned i; + for (i = 0; i < vector_size; i++) { + uint32_t idx = components - prog->sh.data->UniformDataSlots; + stage_prog_data->param[uniform_index++] = BRW_PARAM_UNIFORM(idx); + components++; + } - if (!is_scalar) { - /* Pad out with zeros if needed (only needed for vec4) */ - for (; i < max_vector_size; i++) { - stage_prog_data->param[uniform_index++] = - BRW_PARAM_BUILTIN_ZERO; - } + if (!is_scalar) { + /* Pad out with zeros if needed (only needed for vec4) */ + for (; i < max_vector_size; i++) { + stage_prog_data->param[uniform_index++] = + BRW_PARAM_BUILTIN_ZERO; } } } -- 2.30.2