projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b6d014f
)
mesa/es3.1: Allow Multisampled FrameBufferTextures
author
Marta Lofstedt
<marta.lofstedt@intel.com>
Mon, 10 Aug 2015 10:48:11 +0000
(13:48 +0300)
committer
Tapani Pälli
<tapani.palli@intel.com>
Mon, 10 Aug 2015 10:49:41 +0000
(13:49 +0300)
GLES 3.1 must be allowed to use multisampled framebuffer textures.
Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
src/mesa/main/fbobject.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/fbobject.c
b/src/mesa/main/fbobject.c
index
cc342c2
..
8418340
100644
(file)
--- a/
src/mesa/main/fbobject.c
+++ b/
src/mesa/main/fbobject.c
@@
-2944,8
+2944,9
@@
check_textarget(struct gl_context *ctx, int dims, GLenum target,
break;
case GL_TEXTURE_2D_MULTISAMPLE:
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
- err = _mesa_is_gles(ctx)
- || !ctx->Extensions.ARB_texture_multisample;
+ err = (_mesa_is_gles(ctx) ||
+ !ctx->Extensions.ARB_texture_multisample) &&
+ !_mesa_is_gles31(ctx);
break;
default:
err = true;