summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-11-15 22:13:48 -0800
committerMatt Turner <[email protected]>2013-01-10 10:57:51 -0800
commitec8ee91923b13f972f5f7cf0573e7c412bf2de05 (patch)
tree363189bbd5d94ae3f1c1e3637de7fe996c2033cd
parent75b963c095d28e1a1b31753142e2d5f934b62f79 (diff)
mesa: Allow GL_DEPTH_STENCIL_ATTACHMENT in ES 3
Fixes framebuffer_srgb_default_encoding_fbo and 5 packed_depth_stencil tests from es3conform. Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/mesa/main/fbobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 281cdd05c72..50ad84c5659 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -222,7 +222,7 @@ _mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
}
return &fb->Attachment[BUFFER_COLOR0 + i];
case GL_DEPTH_STENCIL_ATTACHMENT:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
return NULL;
/* fall-through */
case GL_DEPTH_ATTACHMENT_EXT: