diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2015-10-01 09:08:20 +0200 |
|---|---|---|
| committer | Iago Toral Quiroga <itoral@igalia.com> | 2015-10-14 08:11:13 +0200 |
| commit | 27dccf097d053b085c498a7bcab47197a5e83525 (patch) | |
| tree | 76d76a360c20638612405e323bc6d34149a2fd2a /src/mesa/main/shaderobj.c | |
| parent | 9de651b261286f15ae000e4a698587b805b95d2b (diff) | |
| download | external_mesa3d-27dccf097d053b085c498a7bcab47197a5e83525.zip external_mesa3d-27dccf097d053b085c498a7bcab47197a5e83525.tar.gz external_mesa3d-27dccf097d053b085c498a7bcab47197a5e83525.tar.bz2 | |
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 <krh@bitplanet.net>
Diffstat (limited to 'src/mesa/main/shaderobj.c')
| -rw-r--r-- | src/mesa/main/shaderobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 4e85fda..ffc7193 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -290,8 +290,8 @@ _mesa_clear_shader_program_data(struct gl_shader_program *shProg) ralloc_free(shProg->InfoLog); shProg->InfoLog = ralloc_strdup(shProg, ""); - ralloc_free(shProg->UniformBlocks); - shProg->UniformBlocks = NULL; + ralloc_free(shProg->BufferInterfaceBlocks); + shProg->BufferInterfaceBlocks = NULL; shProg->NumBufferInterfaceBlocks = 0; for (i = 0; i < MESA_SHADER_STAGES; i++) { ralloc_free(shProg->UniformBlockStageIndex[i]); |