summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarta Lofstedt <[email protected]>2015-05-11 15:03:56 +0200
committerTapani Pälli <[email protected]>2015-08-03 12:32:30 +0300
commit704e764f06e8e6ec75484e28271e502bbc4cf06a (patch)
tree2e9c926caef64d35288cf3729635e3a8aa2f4eb6 /src
parent2253a296c9ad7b11f9844640024c5f0784e4e528 (diff)
mesa/es3.1: Allow multisampled textures for GLES 3.1
GLES 3.1 must be allowed to create multisampled textures. Signed-off-by: Marta Lofstedt <[email protected]> Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/teximage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a719c1c5d4c..841ec364020 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -5589,8 +5589,8 @@ _mesa_texture_image_multisample(struct gl_context *ctx, GLuint dims,
GLenum sample_count_error;
bool dsa = strstr(func, "ture") ? true : false;
- if (!(ctx->Extensions.ARB_texture_multisample
- && _mesa_is_desktop_gl(ctx))) {
+ if (!((ctx->Extensions.ARB_texture_multisample
+ && _mesa_is_desktop_gl(ctx))) && !_mesa_is_gles31(ctx)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(unsupported)", func);
return;
}