summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/uniform_query.cpp
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2016-07-05 18:40:30 +1000
committerTimothy Arceri <timothy.arceri@collabora.com>2016-07-05 18:42:06 +1000
commit30812e90d178de91e0aa3226d4472304746c710d (patch)
tree3e9d072449b4d930c24c3600603cf36f22eb8547 /src/mesa/main/uniform_query.cpp
parent6a524c76f502fe15bb3612065a23ece693aed237 (diff)
downloadexternal_mesa3d-30812e90d178de91e0aa3226d4472304746c710d.zip
external_mesa3d-30812e90d178de91e0aa3226d4472304746c710d.tar.gz
external_mesa3d-30812e90d178de91e0aa3226d4472304746c710d.tar.bz2
mesa: fix build error
Fix build error cased by 6a524c76f5.
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 ebe5225..58ee408 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -1071,7 +1071,7 @@ _mesa_sampler_uniforms_pipeline_are_valid(struct gl_pipeline_object *pipeline)
GLbitfield mask;
GLbitfield TexturesUsed[MAX_COMBINED_TEXTURE_IMAGE_UNITS];
- struct gl_shader *shader;
+ struct gl_linked_shader *shader;
unsigned active_samplers = 0;
const struct gl_shader_program **shProg =
(const struct gl_shader_program **) pipeline->CurrentProgram;