From 6668eb5a451c43ac78a784711cf239fdf7ca75ef Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Fri, 11 Sep 2015 12:29:37 +0200 Subject: [PATCH] mesa: rename gl_shader_program's NumUniformBlocks to NumBufferInterfaceBlocks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Because it counts shader storage blocks too. v2: - Use NumBufferInterfaceBlocks instead (Jordan). Signed-off-by: Samuel Iglesias Gonsalvez Reviewed-by: Jordan Justen Reviewed-by: Kristian Høgsberg --- src/glsl/link_uniform_initializers.cpp | 2 +- src/glsl/link_uniforms.cpp | 4 ++-- src/glsl/linker.cpp | 10 +++++----- src/glsl/standalone_scaffolding.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 8 ++++---- src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 8 ++++---- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 2 +- src/mesa/main/mtypes.h | 2 +- src/mesa/main/shaderapi.c | 4 ++-- src/mesa/main/shaderobj.c | 2 +- src/mesa/main/uniforms.c | 8 ++++---- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp index 05000fc39ef..34830829b4a 100644 --- a/src/glsl/link_uniform_initializers.cpp +++ b/src/glsl/link_uniform_initializers.cpp @@ -48,7 +48,7 @@ static unsigned get_uniform_block_index(const gl_shader_program *shProg, const char *uniformBlockName) { - for (unsigned i = 0; i < shProg->NumUniformBlocks; i++) { + for (unsigned i = 0; i < shProg->NumBufferInterfaceBlocks; i++) { if (!strcmp(shProg->UniformBlocks[i].Name, uniformBlockName)) return i; } diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp index 94d7287221a..47d49c84e65 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/glsl/link_uniforms.cpp @@ -500,7 +500,7 @@ public: if (var->is_interface_instance() && var->type->is_array()) { unsigned l = strlen(var->get_interface_type()->name); - for (unsigned i = 0; i < prog->NumUniformBlocks; i++) { + for (unsigned i = 0; i < prog->NumBufferInterfaceBlocks; i++) { if (strncmp(var->get_interface_type()->name, prog->UniformBlocks[i].Name, l) == 0 @@ -510,7 +510,7 @@ public: } } } else { - for (unsigned i = 0; i < prog->NumUniformBlocks; i++) { + for (unsigned i = 0; i < prog->NumBufferInterfaceBlocks; i++) { if (strcmp(var->get_interface_type()->name, prog->UniformBlocks[i].Name) == 0) { ubo_block_index = i; diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 75396fb3936..9bacd22b9d4 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1187,7 +1187,7 @@ interstage_cross_validate_uniform_blocks(struct gl_shader_program *prog) for (unsigned int j = 0; j < sh->NumUniformBlocks; j++) { int index = link_cross_validate_uniform_block(prog, &prog->UniformBlocks, - &prog->NumUniformBlocks, + &prog->NumBufferInterfaceBlocks, &sh->UniformBlocks[j]); if (index == -1) { @@ -2802,7 +2802,7 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) unsigned shader_blocks[MESA_SHADER_STAGES] = {0}; unsigned total_shader_storage_blocks = 0; - for (unsigned i = 0; i < prog->NumUniformBlocks; i++) { + for (unsigned i = 0; i < prog->NumBufferInterfaceBlocks; i++) { /* Don't check SSBOs for Uniform Block Size */ if (!prog->UniformBlocks[i].IsShaderStorage && prog->UniformBlocks[i].UniformBufferSize > ctx->Const.MaxUniformBlockSize) { @@ -2836,7 +2836,7 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) if (total_uniform_blocks > ctx->Const.MaxCombinedUniformBlocks) { linker_error(prog, "Too many combined uniform blocks (%d/%d)\n", - prog->NumUniformBlocks, + prog->NumBufferInterfaceBlocks, ctx->Const.MaxCombinedUniformBlocks); } else { for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { @@ -2939,7 +2939,7 @@ check_image_resources(struct gl_context *ctx, struct gl_shader_program *prog) total_image_units += sh->NumImages; - for (unsigned j = 0; j < prog->NumUniformBlocks; j++) { + for (unsigned j = 0; j < prog->NumBufferInterfaceBlocks; j++) { int stage_index = prog->UniformBlockStageIndex[i][j]; if (stage_index != -1 && sh->UniformBlocks[stage_index].IsShaderStorage) total_shader_storage_blocks++; @@ -3418,7 +3418,7 @@ build_program_resource_list(struct gl_shader_program *shProg) } /* Add program uniform blocks and shader storage blocks. */ - for (unsigned i = 0; i < shProg->NumUniformBlocks; i++) { + for (unsigned i = 0; i < shProg->NumBufferInterfaceBlocks; i++) { bool is_shader_storage = shProg->UniformBlocks[i].IsShaderStorage; GLenum type = is_shader_storage ? GL_SHADER_STORAGE_BLOCK : GL_UNIFORM_BLOCK; if (!add_program_resource(shProg, type, diff --git a/src/glsl/standalone_scaffolding.cpp b/src/glsl/standalone_scaffolding.cpp index e52869f288e..ea9334fd7b7 100644 --- a/src/glsl/standalone_scaffolding.cpp +++ b/src/glsl/standalone_scaffolding.cpp @@ -101,7 +101,7 @@ _mesa_clear_shader_program_data(struct gl_shader_program *shProg) ralloc_free(shProg->UniformBlocks); shProg->UniformBlocks = NULL; - shProg->NumUniformBlocks = 0; + shProg->NumBufferInterfaceBlocks = 0; for (i = 0; i < MESA_SHADER_STAGES; i++) { ralloc_free(shProg->UniformBlockStageIndex[i]); shProg->UniformBlockStageIndex[i] = NULL; diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index a2bc5c64e4e..cf7e74256fc 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -1530,7 +1530,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr */ brw_mark_surface_used(prog_data, stage_prog_data->binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } if (has_indirect) { @@ -1593,7 +1593,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr */ brw_mark_surface_used(prog_data, stage_prog_data->binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } /* Get the offset to read from */ @@ -1786,7 +1786,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr brw_mark_surface_used(prog_data, stage_prog_data->binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } /* Offset */ @@ -1952,7 +1952,7 @@ fs_visitor::nir_emit_ssbo_atomic(const fs_builder &bld, */ brw_mark_surface_used(prog_data, stage_prog_data->binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } fs_reg offset = get_nir_src(instr->src[1]); diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp index 2d2e5753eff..94906d2e705 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp @@ -592,7 +592,7 @@ vec4_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr) brw_mark_surface_used(&prog_data->base, prog_data->base.binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } /* Offset */ @@ -739,7 +739,7 @@ vec4_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr) */ brw_mark_surface_used(&prog_data->base, prog_data->base.binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } src_reg offset_reg = src_reg(this, glsl_type::uint_type); @@ -889,7 +889,7 @@ vec4_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr) */ brw_mark_surface_used(&prog_data->base, prog_data->base.binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } unsigned const_offset = instr->const_index[0]; @@ -950,7 +950,7 @@ vec4_visitor::nir_emit_ssbo_atomic(int op, nir_intrinsic_instr *instr) */ brw_mark_surface_used(&prog_data->base, prog_data->base.binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } src_reg offset = get_nir_src(instr->src[1], 1); diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 3443e5cb759..3cb783ece1c 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -1872,7 +1872,7 @@ vec4_visitor::visit(ir_expression *ir) */ brw_mark_surface_used(&prog_data->base, prog_data->base.binding_table.ubo_start + - shader_prog->NumUniformBlocks - 1); + shader_prog->NumBufferInterfaceBlocks - 1); } if (const_offset_ir) { diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index a872942d2a8..288d75790a4 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2689,7 +2689,7 @@ struct gl_shader_program */ unsigned LastClipDistanceArraySize; - unsigned NumUniformBlocks; + unsigned NumBufferInterfaceBlocks; struct gl_uniform_block *UniformBlocks; /** diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 00c51e2bd3d..418121dcb99 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -713,7 +713,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, if (!has_ubo) break; - for (i = 0; i < shProg->NumUniformBlocks; i++) { + for (i = 0; i < shProg->NumBufferInterfaceBlocks; i++) { /* Add one for the terminating NUL character. */ const GLint len = strlen(shProg->UniformBlocks[i].Name) + 1; @@ -730,7 +730,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, break; *params = 0; - for (unsigned i = 0; i < shProg->NumUniformBlocks; i++) { + for (unsigned i = 0; i < shProg->NumBufferInterfaceBlocks; i++) { if (!shProg->UniformBlocks[i].IsShaderStorage) (*params)++; } diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 71d4ed69285..5cd37d7e4c4 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -294,7 +294,7 @@ _mesa_clear_shader_program_data(struct gl_shader_program *shProg) ralloc_free(shProg->UniformBlocks); shProg->UniformBlocks = NULL; - shProg->NumUniformBlocks = 0; + shProg->NumBufferInterfaceBlocks = 0; for (i = 0; i < MESA_SHADER_STAGES; i++) { ralloc_free(shProg->UniformBlockStageIndex[i]); shProg->UniformBlockStageIndex[i] = NULL; diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index c491707e937..04cc81f9809 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -1002,10 +1002,10 @@ _mesa_UniformBlockBinding(GLuint program, if (!shProg) return; - if (uniformBlockIndex >= shProg->NumUniformBlocks) { + if (uniformBlockIndex >= shProg->NumBufferInterfaceBlocks) { _mesa_error(ctx, GL_INVALID_VALUE, "glUniformBlockBinding(block index %u >= %u)", - uniformBlockIndex, shProg->NumUniformBlocks); + uniformBlockIndex, shProg->NumBufferInterfaceBlocks); return; } @@ -1054,10 +1054,10 @@ _mesa_ShaderStorageBlockBinding(GLuint program, if (!shProg) return; - if (shaderStorageBlockIndex >= shProg->NumUniformBlocks) { + if (shaderStorageBlockIndex >= shProg->NumBufferInterfaceBlocks) { _mesa_error(ctx, GL_INVALID_VALUE, "glShaderStorageBlockBinding(block index %u >= %u)", - shaderStorageBlockIndex, shProg->NumUniformBlocks); + shaderStorageBlockIndex, shProg->NumBufferInterfaceBlocks); return; } -- 2.30.2