OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
afe3d15
)
glsl: the number of samplers is already calculated so use it
author
Timothy Arceri
<t_arceri@yahoo.com.au>
Sun, 11 May 2014 12:11:21 +0000
(22:11 +1000)
committer
Timothy Arceri
<t_arceri@yahoo.com.au>
Mon, 12 May 2014 21:40:08 +0000
(07:40 +1000)
Signed-off-by: Timothy Arceri <t_arceri@yahoo.com.au>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/glsl/link_uniforms.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/link_uniforms.cpp
b/src/glsl/link_uniforms.cpp
index
29dc0b1
..
c7147e0
100644
(file)
--- a/
src/glsl/link_uniforms.cpp
+++ b/
src/glsl/link_uniforms.cpp
@@
-308,8
+308,7
@@
private:
*/
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;