summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/uniform_query.cpp
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-11-04 11:40:10 +1100
committerTimothy Arceri <[email protected]>2017-01-06 11:21:42 +1100
commit4807a83da0e0f5e3272e85504ee3b2213ef1910a (patch)
tree049b5850dad445b764189b9ba122b6fb51876d63 /src/mesa/main/uniform_query.cpp
parentc46a630000a2539e38a448f24a456397ce201a2e (diff)
mesa/glsl: set num_textures per stage directly in shader_info
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
-rw-r--r--src/mesa/main/uniform_query.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index ec6d2774844..73e7b0bfdfd 100644
--- 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_samplers;
+ active_samplers += shader->Program->info.num_textures;
}
if (active_samplers > MAX_COMBINED_TEXTURE_IMAGE_UNITS) {