projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Rename brw_disasm to brw_disassemble_inst.
[mesa.git]
/
src
/
glsl
/
link_uniforms.cpp
diff --git
a/src/glsl/link_uniforms.cpp
b/src/glsl/link_uniforms.cpp
index 3fedf313cbdacf765c5cca9dfabb895f840a9cf2..c7147e0ee8eaf4e926a7bdf2876ebc954061fac7 100644
(file)
--- a/
src/glsl/link_uniforms.cpp
+++ b/
src/glsl/link_uniforms.cpp
@@
-212,7
+212,7
@@
program_resource_visitor::recursion(const glsl_type *t, char **name,
void
program_resource_visitor::visit_field(const glsl_type *type, const char *name,
bool row_major,
void
program_resource_visitor::visit_field(const glsl_type *type, const char *name,
bool row_major,
- const glsl_type *
record_type
)
+ const glsl_type *)
{
visit_field(type, name, row_major);
}
{
visit_field(type, name, row_major);
}
@@
-308,8
+308,7
@@
private:
*/
const unsigned values = values_for_type(type);
if (type->contains_sampler()) {
*/
const unsigned values = values_for_type(type);
if (type->contains_sampler()) {
- this->num_shader_samplers +=
- type->is_array() ? type->array_size() : 1;
+ this->num_shader_samplers += values;
} else if (type->contains_image()) {
this->num_shader_images += values;
} else if (type->contains_image()) {
this->num_shader_images += values;