commit d1fff586eae303f581c01adc363017642a529be6
author Antonio Maiorano <amaiorano@google.com> Tue Apr 16 10:08:39 2019 -0400
committer Antonio Maiorano <amaiorano@google.com> Wed Apr 17 13:30:19 2019 +0000
tree 73944bc4b98b3e1997a00652c1683ffd5a66da9a
parent 8e2440d06f5abaca8dbd2e0c6b4e24ce0697f802

Fix 2D texture image functions not returning  GL_INVALID_ENUM with target == GL_TEXTURE_3D

In particular, many of these would produce an UNREACHABLE assert in libGLESv2, such as glCopyTexSubImage2D.

Bug: b/116827965
Change-Id: I719ff20b7452d0b933b8e4120abe831783844342
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/29048
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>

src/OpenGL/libGLESv2/libGLESv2.cpp

diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index 86ebabb..75f4d06 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -794,7 +794,7 @@
 	      "GLsizei imageSize = %d, const GLvoid* data = %p)",
 	      target, level, xoffset, yoffset, width, height, format, imageSize, data);
 
-	if(!es2::IsTextureTarget(target))
+	if(!es2::IsTexImageTarget(target))
 	{
 		return error(GL_INVALID_ENUM);
 	}
@@ -1017,7 +1017,7 @@
 	      "GLint x = %d, GLint y = %d, GLsizei width = %d, GLsizei height = %d)",
 	      target, level, xoffset, yoffset, x, y, width, height);
 
-	if(!es2::IsTextureTarget(target))
+	if(!es2::IsTexImageTarget(target))
 	{
 		return error(GL_INVALID_ENUM);
 	}
@@ -4886,7 +4886,7 @@
 	      "const GLvoid* data = %p)",
 	      target, level, xoffset, yoffset, width, height, format, type, data);
 
-	if(!es2::IsTextureTarget(target))
+	if(!es2::IsTexImageTarget(target))
 	{
 		return error(GL_INVALID_ENUM);
 	}