diff options
| author | Timothy Arceri <[email protected]> | 2016-04-02 13:59:46 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-04-02 17:10:56 +1100 |
| commit | 070e5a740545a93a75fa5c79a79b50f472cb8e16 (patch) | |
| tree | 94b489570825ff3c467e20b3506c3faedd3389b7 /src/compiler/glsl | |
| parent | 0fbd073dc284f952ea7df691941a65ddc89b7554 (diff) | |
glsl: rename var and simplify if
is_ubo_var is true for both UBOs and SSBOs
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/link_uniforms.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index 43ff52522ee..7d8a4b4fb79 100644 --- a/src/compiler/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp @@ -282,7 +282,7 @@ public: : num_active_uniforms(0), num_hidden_uniforms(0), num_values(0), num_shader_samplers(0), num_shader_images(0), num_shader_uniform_components(0), num_shader_subroutines(0), - is_ubo_var(false), is_shader_storage(false), map(map), + is_buffer_block(false), is_shader_storage(false), map(map), hidden_map(hidden_map) { /* empty */ @@ -299,7 +299,7 @@ public: void process(ir_variable *var) { this->current_var = var; - this->is_ubo_var = var->is_in_buffer_block(); + this->is_buffer_block = var->is_in_buffer_block(); this->is_shader_storage = var->is_in_shader_storage_block(); if (var->is_interface_instance()) program_resource_visitor::process(var->get_interface_type(), @@ -340,7 +340,7 @@ public: */ unsigned num_shader_subroutines; - bool is_ubo_var; + bool is_buffer_block; bool is_shader_storage; struct string_to_uint_map *map; @@ -380,7 +380,7 @@ private: * Note that samplers do not count against this limit because they * don't use any storage on current hardware. */ - if (!is_ubo_var && !is_shader_storage) + if (!is_buffer_block) this->num_shader_uniform_components += values; } |