diff options
| author | Marta Lofstedt <marta.lofstedt@intel.com> | 2015-08-10 13:48:11 +0300 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2015-08-10 13:49:41 +0300 |
| commit | 08f2dfe3430789085c165ce7c546d5afd2e295c2 (patch) | |
| tree | 78be7336b5459a583650945929931302316239a6 /src/mesa/main/fbobject.c | |
| parent | b6d014f0ba010f0e61be43abdceb5f2201028a04 (diff) | |
| download | external_mesa3d-08f2dfe3430789085c165ce7c546d5afd2e295c2.zip external_mesa3d-08f2dfe3430789085c165ce7c546d5afd2e295c2.tar.gz external_mesa3d-08f2dfe3430789085c165ce7c546d5afd2e295c2.tar.bz2 | |
mesa/es3.1: Allow Multisampled FrameBufferTextures
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>
Diffstat (limited to 'src/mesa/main/fbobject.c')
| -rw-r--r-- | src/mesa/main/fbobject.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index cc342c2..8418340 100644 --- 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; |