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

glsl: combine if blocks

Browse source 
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Timothy Arceri 2016-01-08 15:25:36 +11:00
parent 7b4f8c827d
commit e4c5ace6a9
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/glsl/link_uniforms.cpp
View file

@ -532,6 +532,8 @@ public:
*/
if (var->is_interface_instance()) {
ubo_byte_offset = 0;
process(var->get_interface_type(),
var->get_interface_type()->name);
} else {
const struct gl_uniform_block *const block =
&prog->BufferInterfaceBlocks[ubo_block_index];
@ -542,13 +544,8 @@ public:
&block->Uniforms[var->data.location];
ubo_byte_offset = ubo_var->Offset;
}
if (var->is_interface_instance())
process(var->get_interface_type(),
var->get_interface_type()->name);
else
process(var);
}
} else {
/* Store any explicit location and reset data location so we can
* reuse this variable for storing the uniform slot number.