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/glsl/nir | |
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/glsl/nir')
-rw-r--r-- | src/glsl/nir/glsl_to_nir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp index 4b9201e2f60..6f67b1dae5b 100644 --- a/src/glsl/nir/glsl_to_nir.cpp +++ b/src/glsl/nir/glsl_to_nir.cpp @@ -152,7 +152,7 @@ glsl_to_nir(const struct gl_shader_program *shader_prog, shader->info.name = ralloc_asprintf(shader, "GLSL%d", sh->Name); shader->info.num_textures = num_textures; - shader->info.num_ubos = sh->NumUniformBlocks; + shader->info.num_ubos = sh->NumBufferInterfaceBlocks; shader->info.num_abos = shader_prog->NumAtomicBuffers; shader->info.num_ssbos = shader_prog->NumBufferInterfaceBlocks; shader->info.num_images = sh->NumImages; |