commit 55ba29c54fb10f88c6dcdd48c6704f2847c6b9ca
author Geoff Lang <geofflang@google.com> Thu Jul 11 16:57:53 2013 -0400
committer Geoff Lang <geofflang@google.com> Mon Jul 29 09:43:35 2013 -0400
tree e10dcf9bfd6ec381b184c10e5911167948d7e640
parent 1c3192efe2fd2a7d11e46d1efed08474f301dd08

Implement the DEPTH_STENCIL attachment point for FBOs.

Trac #23469

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index e872131..47d23bf 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -4170,6 +4170,12 @@
                   case GL_DEPTH_ATTACHMENT:
                   case GL_STENCIL_ATTACHMENT:
                     break;
+                  case GL_DEPTH_STENCIL_ATTACHMENT:
+                    if (context->getClientVersion() < 3)
+                    {
+                        return gl::error(GL_INVALID_ENUM);
+                    }
+                    break;
                   default:
                     return gl::error(GL_INVALID_ENUM);
                 }
@@ -4266,8 +4272,9 @@
             {
                 switch (attachment)
                 {
-                  case GL_DEPTH_ATTACHMENT:   framebuffer->setDepthbuffer(textarget, texture);   break;
-                  case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture); break;
+                  case GL_DEPTH_ATTACHMENT:         framebuffer->setDepthbuffer(textarget, texture);        break;
+                  case GL_STENCIL_ATTACHMENT:       framebuffer->setStencilbuffer(textarget, texture);      break;
+                  case GL_DEPTH_STENCIL_ATTACHMENT: framebuffer->setDepthStencilBuffer(textarget, texture); break;
                 }
             }
         }
@@ -5065,6 +5072,17 @@
                     attachmentType = framebuffer->getStencilbufferType();
                     attachmentHandle = framebuffer->getStencilbufferHandle();
                     break;
+                  case GL_DEPTH_STENCIL_ATTACHMENT:
+                    if (context->getClientVersion() < 3)
+                    {
+                        return gl::error(GL_INVALID_ENUM);
+                    }
+                    if (framebuffer->getDepthbufferHandle() != framebuffer->getStencilbufferHandle())
+                    {
+                        return gl::error(GL_INVALID_OPERATION);
+                    }
+                    attachmentType = framebuffer->getDepthStencilbufferType();
+                    attachmentHandle = framebuffer->getDepthStencilbufferHandle();
                   default: return gl::error(GL_INVALID_ENUM);
                 }
             }