summaryrefslogtreecommitdiffstats
path: root/src/glsl/link_uniform_blocks.cpp
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2013-01-28 14:43:03 -0800
committerPaul Berry <stereotype441@gmail.com>2013-02-04 10:36:40 -0800
commitb4db34cc4c047427a21efb9bde03d7e125f70e55 (patch)
treed93762b857d4bea407731e613935f386aae7c825 /src/glsl/link_uniform_blocks.cpp
parentb92900d26a54ef997f2920d6a7371bb7c9caabf8 (diff)
downloadexternal_mesa3d-b4db34cc4c047427a21efb9bde03d7e125f70e55.zip
external_mesa3d-b4db34cc4c047427a21efb9bde03d7e125f70e55.tar.gz
external_mesa3d-b4db34cc4c047427a21efb9bde03d7e125f70e55.tar.bz2
glsl: Rename uniform_field_visitor to program_resource_visitor.
There's actually nothing uniform-specific in uniform_field_visitor. It is potentially useful for all kinds of program resources (in particular, future patches will use it for transform feedback varyings). This patch renames it to program_resource_visitor, and clarifies several comments, to reflect the fact that it is useful for more than just uniforms. NOTE: This is a candidate for the 9.1 branch. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/glsl/link_uniform_blocks.cpp')
-rw-r--r--src/glsl/link_uniform_blocks.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/link_uniform_blocks.cpp b/src/glsl/link_uniform_blocks.cpp
index 74fe1e2..c72d1d8 100644
--- a/src/glsl/link_uniform_blocks.cpp
+++ b/src/glsl/link_uniform_blocks.cpp
@@ -29,7 +29,7 @@
#include "main/hash_table.h"
#include "program.h"
-class ubo_visitor : public uniform_field_visitor {
+class ubo_visitor : public program_resource_visitor {
public:
ubo_visitor(void *mem_ctx, gl_uniform_buffer_variable *variables,
unsigned num_variables)
@@ -44,7 +44,7 @@ public:
this->offset = 0;
this->buffer_size = 0;
this->is_array_instance = strchr(name, ']') != NULL;
- this->uniform_field_visitor::process(type, name);
+ this->program_resource_visitor::process(type, name);
}
unsigned index;
@@ -112,7 +112,7 @@ private:
}
};
-class count_block_size : public uniform_field_visitor {
+class count_block_size : public program_resource_visitor {
public:
count_block_size() : num_active_uniforms(0)
{