Module: Mesa
Branch: master
Commit: ec8ee91923b13f972f5f7cf0573e7c412bf2de05
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec8ee91923b13f972f5f7cf0573e7c412bf2de05

Author: Matt Turner <[email protected]>
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 <[email protected]>

---

 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 281cdd0..50ad84c 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:

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to