projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mesa/glsl: set num_textures per stage directly in shader_info
[mesa.git]
/
src
/
mesa
/
main
/
uniform_query.cpp
diff --git
a/src/mesa/main/uniform_query.cpp
b/src/mesa/main/uniform_query.cpp
index ec6d27748449cc4787f8cf35a715957fcd8cb771..73e7b0bfdfd1ee1e63b7d4efc96e1d11a4bbf9e8 100644
(file)
--- a/
src/mesa/main/uniform_query.cpp
+++ b/
src/mesa/main/uniform_query.cpp
@@
-1141,7
+1141,7
@@
_mesa_sampler_uniforms_pipeline_are_valid(struct gl_pipeline_object *pipeline)
TexturesUsed[unit] |= (1 << tgt);
}
- active_samplers += shader->
num_sampler
s;
+ active_samplers += shader->
Program->info.num_texture
s;
}
if (active_samplers > MAX_COMBINED_TEXTURE_IMAGE_UNITS) {