From: Matt Turner <mattst88@gmail.com>
Date: Fri, 16 Nov 2012 06:13:48 +0000 (-0800)
Subject: mesa: Allow GL_DEPTH_STENCIL_ATTACHMENT in ES 3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ec8ee91923b13f972f5f7cf0573e7c412bf2de05;p=mesa.git

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 <kenneth@whitecape.org>
---

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: