diff options
| author | Iago Toral Quiroga <[email protected]> | 2015-10-01 09:08:20 +0200 |
|---|---|---|
| committer | Iago Toral Quiroga <[email protected]> | 2015-10-14 08:11:13 +0200 |
| commit | 27dccf097d053b085c498a7bcab47197a5e83525 (patch) | |
| tree | 76d76a360c20638612405e323bc6d34149a2fd2a /src/mesa/main/shader_query.cpp | |
| parent | 9de651b261286f15ae000e4a698587b805b95d2b (diff) | |
mesa: Rename {Num}UniformBlocks to {Num}BufferInterfaceBlocks
Currently, these arrays in gl_shader and gl_shader_program hold both
UBOs and SSBOs, so this looks like a better name. We were already
using NumBufferInterfaceBlocks in gl_shader_program, so this makes
things more consistent as well.
In a later patch we will add {Num}UniformBlocks and
{Num}ShaderStorageBlocks which will contain only references to
UBOs and SSBOs respectively that will provide backends with
a separate index space for both types of objects.
Reviewed-by: Kristian Høgsberg <[email protected]>
Diffstat (limited to 'src/mesa/main/shader_query.cpp')
| -rw-r--r-- | src/mesa/main/shader_query.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 324e1a68fa4..50b44fa9e16 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -927,7 +927,7 @@ program_resource_top_level_array_size(struct gl_shader_program *shProg, int array_size = -1; char *var_name = get_top_level_name(name); char *interface_name = - get_top_level_name(shProg->UniformBlocks[block_index].Name); + get_top_level_name(shProg->BufferInterfaceBlocks[block_index].Name); if (strcmp(var_name, interface_name) == 0) { /* Deal with instanced array of SSBOs */ @@ -997,7 +997,7 @@ program_resource_top_level_array_stride(struct gl_shader_program *shProg, int array_stride = -1; char *var_name = get_top_level_name(name); char *interface_name = - get_top_level_name(shProg->UniformBlocks[block_index].Name); + get_top_level_name(shProg->BufferInterfaceBlocks[block_index].Name); if (strcmp(var_name, interface_name) == 0) { /* Deal with instanced array of SSBOs */ |