Mesa (gles3): mesa: Allow GL_DEPTH_STENCIL_ATTACHMENT in ES 3

Matt Turner mattst88 at kemper.freedesktop.org
Tue Nov 20 04:19:40 UTC 2012


Module: Mesa
Branch: gles3
Commit: 5bdf6146eb200afb77fdf0421dfb493a1764f52a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bdf6146eb200afb77fdf0421dfb493a1764f52a

Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Nov 15 22:13:48 2012 -0800

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 at whitecape.org>

---

 src/mesa/main/fbobject.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 223aef1..804be0a 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:




More information about the mesa-commit mailing list