fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 07:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl/lower_ubo_reference: lower UBOs and SSBOs to separate index spaces

Browse source 
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Iago Toral Quiroga 2015-10-09 13:54:41 +02:00
parent d31f98a272
commit 56e2bdbca3
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/glsl/lower_ubo_reference.cpp
View file

@ -277,10 +277,20 @@ lower_ubo_reference_visitor::setup_for_load_or_store(ir_variable *var,
interface_field_name(mem_ctx, (char *) var->get_interface_type()->name, interface_field_name(mem_ctx, (char *) var->get_interface_type()->name,
deref, &nonconst_block_index); deref, &nonconst_block_index);
/* Locate the ubo block by interface name */ /* Locate the block by interface name */
this->is_shader_storage = var->is_in_shader_storage_block();
unsigned num_blocks;
struct gl_uniform_block **blocks;
if (this->is_shader_storage) {
num_blocks = shader->NumShaderStorageBlocks;
blocks = shader->ShaderStorageBlocks;
} else {
num_blocks = shader->NumUniformBlocks;
blocks = shader->UniformBlocks;
}
this->uniform_block = NULL; this->uniform_block = NULL;
for (unsigned i = 0; i < shader->NumBufferInterfaceBlocks; i++) { for (unsigned i = 0; i < num_blocks; i++) {
if (strcmp(field_name, shader->BufferInterfaceBlocks[i].Name) == 0) { if (strcmp(field_name, blocks[i]->Name) == 0) {
ir_constant *index = new(mem_ctx) ir_constant(i); ir_constant *index = new(mem_ctx) ir_constant(i);
@ -292,12 +302,8 @@ lower_ubo_reference_visitor::setup_for_load_or_store(ir_variable *var,
this->uniform_block = index; this->uniform_block = index;
} }
this->is_shader_storage = shader->BufferInterfaceBlocks[i].IsShaderStorage;
struct gl_uniform_block *block = &shader->BufferInterfaceBlocks[i];
this->ubo_var = var->is_interface_instance() this->ubo_var = var->is_interface_instance()
? &block->Uniforms[0] : &block->Uniforms[var->data.location]; ? &blocks[i]->Uniforms[0] : &blocks[i]->Uniforms[var->data.location];
break; break;
} }