Fix framebuffer attachment parameter query error.

OpenGL ES 2.0 expects GL_INVALID_OPERATION when querying default framebuffer attachment parameters. Change-Id: Ie0e0c35ad835e06b16c7aaaea48f7ec7eb64c663 Reviewed-on: https://swiftshader-review.googlesource.com/5124Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Fix framebuffer attachment parameter query error.
e5f3d7f6 · Nicolas Capens · b5e346f5 · e5f3d7f6
Commit e5f3d7f6 authored Apr 14, 2016 by Nicolas Capens
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 11 deletions

libGLESv2.cpp src/OpenGL/libGLESv2/libGLESv2.cpp +17 -11

No files found.
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -2730,32 +2730,35 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu
 	if(context)
 	{
-		if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER_ANGLE && target != GL_READ_FRAMEBUFFER_ANGLE)
+		if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER && target != GL_READ_FRAMEBUFFER)
 		{
 			return error(GL_INVALID_ENUM);
 		}
 		GLint clientVersion = context->getClientVersion();
-		es2::Framebuffer *framebuffer = NULL;
+		es2::Framebuffer *framebuffer = nullptr;
-		if(target == GL_READ_FRAMEBUFFER_ANGLE)
+		if(target == GL_READ_FRAMEBUFFER)
 		{
 			if(context->getReadFramebufferName() == 0)
 			{
+				if(clientVersion < 3)
+				{
+					return error(GL_INVALID_OPERATION);
+				}
+				else
+				{
 					switch(attachment)
 					{
 					case GL_BACK:
 					case GL_DEPTH:
 					case GL_STENCIL:
-					if(clientVersion >= 3)
-					{
 						break;
-					}
-					// fall through
 					default:
 						return error(GL_INVALID_ENUM);
 					}
 				}
+			}
 			framebuffer = context->getReadFramebuffer();
 		}
@@ -2763,20 +2766,23 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu
 		{
 			if(context->getDrawFramebufferName() == 0)
 			{
+				if(clientVersion < 3)
+				{
+					return error(GL_INVALID_OPERATION);
+				}
+				else
+				{
 					switch(attachment)
 					{
 					case GL_BACK:
 					case GL_DEPTH:
 					case GL_STENCIL:
-					if(clientVersion >= 3)
-					{
 						break;
-					}
-					// fall through
 					default:
 						return error(GL_INVALID_ENUM);
 					}
 				}
+			}
 			framebuffer = context->getDrawFramebuffer();
 		}