Browse Source

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>
tags/11.0-branchpoint
Francisco Jerez 10 years ago
parent
commit
6c161405dc
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      src/mesa/main/uniform_query.cpp

+ 3
- 1
src/mesa/main/uniform_query.cpp View File

@@ -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;

Loading…
Cancel
Save