diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2015-08-17 02:05:43 +0300 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2015-08-20 12:26:54 +0300 |
| commit | 6c161405dc191f3d4083a48dfc033d4401b8055a (patch) | |
| tree | dac5cd60db3d54bc14a6e2c625eaf51b4c63dd1b /src/mesa/main/uniform_query.cpp | |
| parent | 86a64dfccfd3e98befa1e58f1a252cf993e5b680 (diff) | |
| download | external_mesa3d-6c161405dc191f3d4083a48dfc033d4401b8055a.zip external_mesa3d-6c161405dc191f3d4083a48dfc033d4401b8055a.tar.gz external_mesa3d-6c161405dc191f3d4083a48dfc033d4401b8055a.tar.bz2 | |
mesa: Refuse to bind image uniforms using glUniform in GLES.
The GLES 3.1 spec removed support for updating the image unit bound to
an image uniform using glUniform1i() calls.
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 036530e..988ec76 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -677,9 +677,11 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, match = (basicType != GLSL_TYPE_DOUBLE); break; case GLSL_TYPE_SAMPLER: - case GLSL_TYPE_IMAGE: match = (basicType == GLSL_TYPE_INT); break; + case GLSL_TYPE_IMAGE: + match = (basicType == GLSL_TYPE_INT && _mesa_is_desktop_gl(ctx)); + break; default: match = (basicType == uni->type->base_type); break; |