projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Turn if (query->bo) into an assertion.
[mesa.git]
/
src
/
glsl
/
link_uniform_blocks.cpp
diff --git
a/src/glsl/link_uniform_blocks.cpp
b/src/glsl/link_uniform_blocks.cpp
index 74fe1e29f6d86c35a20e2f98fca25a4944fb91f4..c72d1d8f1de7f056b143376759cc1b0966d5cc31 100644
(file)
--- 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"
#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)
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->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;
}
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)
{
public:
count_block_size() : num_active_uniforms(0)
{