projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Fold implementation of ir_dereference_array::constant_referenced into wrapper
[mesa.git]
/
src
/
glsl
/
lower_ubo_reference.cpp
diff --git
a/src/glsl/lower_ubo_reference.cpp
b/src/glsl/lower_ubo_reference.cpp
index aade203e724a9dd8a797b9823eddc6eb9fa13aa1..c73b148b00f34d8c94f7f15df2a59246fd24f9bb 100644
(file)
--- a/
src/glsl/lower_ubo_reference.cpp
+++ b/
src/glsl/lower_ubo_reference.cpp
@@
-132,7
+132,8
@@
lower_ubo_reference_visitor::handle_rvalue(ir_rvalue **rvalue)
mem_ctx = ralloc_parent(*rvalue);
const char *const field_name =
mem_ctx = ralloc_parent(*rvalue);
const char *const field_name =
- interface_field_name(mem_ctx, (char *) var->interface_type->name, deref);
+ interface_field_name(mem_ctx, (char *) var->get_interface_type()->name,
+ deref);
this->uniform_block = -1;
for (unsigned i = 0; i < shader->NumUniformBlocks; i++) {
this->uniform_block = -1;
for (unsigned i = 0; i < shader->NumUniformBlocks; i++) {
@@
-142,7
+143,7
@@
lower_ubo_reference_visitor::handle_rvalue(ir_rvalue **rvalue)
struct gl_uniform_block *block = &shader->UniformBlocks[i];
this->ubo_var = var->is_interface_instance()
struct gl_uniform_block *block = &shader->UniformBlocks[i];
this->ubo_var = var->is_interface_instance()
- ? &block->Uniforms[0] : &block->Uniforms[var->location];
+ ? &block->Uniforms[0] : &block->Uniforms[var->
data.
location];
break;
}
break;
}