On Wed, 2015-10-28 at 09:11 +0100, Iago Toral wrote: > Yeah, this makes things more consistent: > Reviewed-by: Iago Toral Quiroga <ito...@igali.com>
I meant: Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> > > On Tue, 2015-10-27 at 22:38 -0700, Jordan Justen wrote: > > Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> > > Cc: Samuel Iglesias Gonsálvez <sigles...@igalia.com> > > Cc: Iago Toral Quiroga <ito...@igalia.com> > > --- > > src/glsl/link_uniform_initializers.cpp | 2 +- > > src/glsl/linker.cpp | 16 ++++++++-------- > > src/glsl/standalone_scaffolding.cpp | 4 ++-- > > src/mesa/main/mtypes.h | 11 ++++++----- > > src/mesa/main/shader_query.cpp | 2 +- > > src/mesa/main/shaderobj.c | 4 ++-- > > src/mesa/main/uniforms.c | 4 ++-- > > 7 files changed, 22 insertions(+), 21 deletions(-) > > > > diff --git a/src/glsl/link_uniform_initializers.cpp > > b/src/glsl/link_uniform_initializers.cpp > > index 682a4ee..58d21e5 100644 > > --- a/src/glsl/link_uniform_initializers.cpp > > +++ b/src/glsl/link_uniform_initializers.cpp > > @@ -178,7 +178,7 @@ set_block_binding(gl_shader_program *prog, const char > > *block_name, int binding) > > > > /* This is a field of a UBO. val is the binding index. */ > > for (int i = 0; i < MESA_SHADER_STAGES; i++) { > > - int stage_index = prog->UniformBlockStageIndex[i][block_index]; > > + int stage_index = prog->InterfaceBlockStageIndex[i][block_index]; > > > > if (stage_index != -1) { > > struct gl_shader *sh = prog->_LinkedShaders[i]; > > diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp > > index cfd8f81..3db2fd3 100644 > > --- a/src/glsl/linker.cpp > > +++ b/src/glsl/linker.cpp > > @@ -1174,10 +1174,10 @@ interstage_cross_validate_uniform_blocks(struct > > gl_shader_program *prog) > > for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { > > struct gl_shader *sh = prog->_LinkedShaders[i]; > > > > - prog->UniformBlockStageIndex[i] = ralloc_array(prog, int, > > - max_num_uniform_blocks); > > + prog->InterfaceBlockStageIndex[i] = ralloc_array(prog, int, > > + > > max_num_uniform_blocks); > > for (unsigned int j = 0; j < max_num_uniform_blocks; j++) > > - prog->UniformBlockStageIndex[i][j] = -1; > > + prog->InterfaceBlockStageIndex[i][j] = -1; > > > > if (sh == NULL) > > continue; > > @@ -1194,7 +1194,7 @@ interstage_cross_validate_uniform_blocks(struct > > gl_shader_program *prog) > > return false; > > } > > > > - prog->UniformBlockStageIndex[i][index] = j; > > + prog->InterfaceBlockStageIndex[i][index] = j; > > } > > } > > > > @@ -2836,9 +2836,9 @@ check_resources(struct gl_context *ctx, struct > > gl_shader_program *prog) > > } > > > > for (unsigned j = 0; j < MESA_SHADER_STAGES; j++) { > > - if (prog->UniformBlockStageIndex[j][i] != -1) { > > + if (prog->InterfaceBlockStageIndex[j][i] != -1) { > > struct gl_shader *sh = prog->_LinkedShaders[j]; > > - int stage_index = prog->UniformBlockStageIndex[j][i]; > > + int stage_index = prog->InterfaceBlockStageIndex[j][i]; > > if (sh && > > sh->BufferInterfaceBlocks[stage_index].IsShaderStorage) { > > shader_blocks[j]++; > > total_shader_storage_blocks++; > > @@ -2955,7 +2955,7 @@ check_image_resources(struct gl_context *ctx, struct > > gl_shader_program *prog) > > total_image_units += sh->NumImages; > > > > for (unsigned j = 0; j < prog->NumBufferInterfaceBlocks; j++) { > > - int stage_index = prog->UniformBlockStageIndex[i][j]; > > + int stage_index = prog->InterfaceBlockStageIndex[i][j]; > > if (stage_index != -1 && > > sh->BufferInterfaceBlocks[stage_index].IsShaderStorage) > > total_shader_storage_blocks++; > > } > > @@ -3734,7 +3734,7 @@ build_program_resource_list(struct gl_shader_program > > *shProg) > > int block_index = shProg->UniformStorage[i].block_index; > > if (block_index != -1) { > > for (unsigned j = 0; j < MESA_SHADER_STAGES; j++) { > > - if (shProg->UniformBlockStageIndex[j][block_index] != -1) > > + if (shProg->InterfaceBlockStageIndex[j][block_index] != -1) > > stageref |= (1 << j); > > } > > } > > diff --git a/src/glsl/standalone_scaffolding.cpp > > b/src/glsl/standalone_scaffolding.cpp > > index eccf094..fe1d820 100644 > > --- a/src/glsl/standalone_scaffolding.cpp > > +++ b/src/glsl/standalone_scaffolding.cpp > > @@ -120,8 +120,8 @@ _mesa_clear_shader_program_data(struct > > gl_shader_program *shProg) > > shProg->NumShaderStorageBlocks = 0; > > > > for (i = 0; i < MESA_SHADER_STAGES; i++) { > > - ralloc_free(shProg->UniformBlockStageIndex[i]); > > - shProg->UniformBlockStageIndex[i] = NULL; > > + ralloc_free(shProg->InterfaceBlockStageIndex[i]); > > + shProg->InterfaceBlockStageIndex[i] = NULL; > > } > > > > ralloc_free(shProg->AtomicBuffers); > > diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h > > index 34120cf..cce959e 100644 > > --- a/src/mesa/main/mtypes.h > > +++ b/src/mesa/main/mtypes.h > > @@ -2715,13 +2715,14 @@ struct gl_shader_program > > struct gl_uniform_block **ShaderStorageBlocks; > > > > /** > > - * Indices into the _LinkedShaders's UniformBlocks[] array for each > > stage > > - * they're used in, or -1. > > + * Indices into the BufferInterfaceBlocks[] array for each stage they're > > + * used in, or -1. > > * > > - * This is used to maintain the Binding values of the stage's > > UniformBlocks[] > > - * and to answer the GL_UNIFORM_BLOCK_REFERENCED_BY_*_SHADER queries. > > + * This is used to maintain the Binding values of the stage's > > + * BufferInterfaceBlocks[] and to answer the > > + * GL_UNIFORM_BLOCK_REFERENCED_BY_*_SHADER queries. > > */ > > - int *UniformBlockStageIndex[MESA_SHADER_STAGES]; > > + int *InterfaceBlockStageIndex[MESA_SHADER_STAGES]; > > > > /** > > * Map of active uniform names to locations > > diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp > > index 59ec3d7..2769c47 100644 > > --- a/src/mesa/main/shader_query.cpp > > +++ b/src/mesa/main/shader_query.cpp > > @@ -965,7 +965,7 @@ is_resource_referenced(struct gl_shader_program *shProg, > > return RESOURCE_ATC(res)->StageReferences[stage]; > > > > if (res->Type == GL_UNIFORM_BLOCK || res->Type == > > GL_SHADER_STORAGE_BLOCK) > > - return shProg->UniformBlockStageIndex[stage][index] != -1; > > + return shProg->InterfaceBlockStageIndex[stage][index] != -1; > > > > return res->StageReferences & (1 << stage); > > } > > diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c > > index ffc7193..203ccef 100644 > > --- a/src/mesa/main/shaderobj.c > > +++ b/src/mesa/main/shaderobj.c > > @@ -294,8 +294,8 @@ _mesa_clear_shader_program_data(struct > > gl_shader_program *shProg) > > shProg->BufferInterfaceBlocks = NULL; > > shProg->NumBufferInterfaceBlocks = 0; > > for (i = 0; i < MESA_SHADER_STAGES; i++) { > > - ralloc_free(shProg->UniformBlockStageIndex[i]); > > - shProg->UniformBlockStageIndex[i] = NULL; > > + ralloc_free(shProg->InterfaceBlockStageIndex[i]); > > + shProg->InterfaceBlockStageIndex[i] = NULL; > > } > > > > ralloc_free(shProg->AtomicBuffers); > > diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c > > index bc23538..758ca24 100644 > > --- a/src/mesa/main/uniforms.c > > +++ b/src/mesa/main/uniforms.c > > @@ -1026,7 +1026,7 @@ _mesa_UniformBlockBinding(GLuint program, > > shProg->BufferInterfaceBlocks[uniformBlockIndex].Binding = > > uniformBlockBinding; > > > > for (i = 0; i < MESA_SHADER_STAGES; i++) { > > - int stage_index = shProg->UniformBlockStageIndex[i][uniformBlockIndex]; > > + int stage_index = > > shProg->InterfaceBlockStageIndex[i][uniformBlockIndex]; > > > > if (stage_index != -1) { > > struct gl_shader *sh = shProg->_LinkedShaders[i]; > > @@ -1079,7 +1079,7 @@ _mesa_ShaderStorageBlockBinding(GLuint program, > > shProg->BufferInterfaceBlocks[shaderStorageBlockIndex].Binding = > > shaderStorageBlockBinding; > > > > for (i = 0; i < MESA_SHADER_STAGES; i++) { > > - int stage_index = > > shProg->UniformBlockStageIndex[i][shaderStorageBlockIndex]; > > + int stage_index = > > shProg->InterfaceBlockStageIndex[i][shaderStorageBlockIndex]; > > > > if (stage_index != -1) { > > struct gl_shader *sh = shProg->_LinkedShaders[i]; > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev