commit d5401e26ea46b4958f84a39c6e6be9d237307336
author Nicolas Capens <capn@google.com> Thu Mar 16 17:32:43 2017 -0400
committer Nicolas Capens <capn@google.com> Thu Apr 13 12:33:06 2017 +0000
tree 5acb49ef10461b9d77b322e99738afb9fbd51439
parent 400667e6604eb07e53a2894ede1f492fc3c0b117

Fix setting depth+stencil texture attachment.

Change-Id: I97f30a38f2f78ae5c4e2be8899dae3c8ff8bc748
Reviewed-on: https://swiftshader-review.googlesource.com/8968
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/OpenGL/libGLESv2/libGLESv2.cpp

diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index ab9fa7e..172a645 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -2062,6 +2062,8 @@
 
 	if(context)
 	{
+		GLint clientVersion = context->getClientVersion();
+
 		if(texture == 0)
 		{
 			textarget = GL_NONE;
@@ -2098,7 +2100,7 @@
 				return error(GL_INVALID_ENUM);
 			}
 
-			if((level != 0) && (context->getClientVersion() < 3))
+			if((level != 0) && (clientVersion < 3))
 			{
 				return error(GL_INVALID_VALUE);
 			}
@@ -2174,6 +2176,14 @@
 			break;
 		case GL_DEPTH_ATTACHMENT:   framebuffer->setDepthbuffer(textarget, texture, level);   break;
 		case GL_STENCIL_ATTACHMENT: framebuffer->setStencilbuffer(textarget, texture, level); break;
+		case GL_DEPTH_STENCIL_ATTACHMENT:
+			if(clientVersion >= 3)
+			{
+				framebuffer->setDepthbuffer(textarget, texture, level);
+				framebuffer->setStencilbuffer(textarget, texture, level);
+				break;
+			}
+			else return error(GL_INVALID_ENUM);
 		default:
 			return error(GL_INVALID_ENUM);
 		}