mesa: Rename {Num}UniformBlocks to {Num}BufferInterfaceBlocks
authorIago Toral Quiroga <itoral@igalia.com>
Thu, 1 Oct 2015 07:08:20 +0000 (09:08 +0200)
committerIago Toral Quiroga <itoral@igalia.com>
Wed, 14 Oct 2015 06:11:13 +0000 (08:11 +0200)
commit27dccf097d053b085c498a7bcab47197a5e83525
tree76d76a360c20638612405e323bc6d34149a2fd2a
parent9de651b261286f15ae000e4a698587b805b95d2b
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>
15 files changed:
src/glsl/link_uniform_initializers.cpp
src/glsl/link_uniforms.cpp
src/glsl/linker.cpp
src/glsl/lower_ubo_reference.cpp
src/glsl/nir/glsl_to_nir.cpp
src/glsl/standalone_scaffolding.cpp
src/mesa/drivers/dri/i965/brw_shader.cpp
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/mtypes.h
src/mesa/main/shader_query.cpp
src/mesa/main/shaderapi.c
src/mesa/main/shaderobj.c
src/mesa/main/uniforms.c
src/mesa/state_tracker/st_atom_constbuf.c
src/mesa/state_tracker/st_glsl_to_tgsi.cpp