Update checks for compressed formats

New compressed formats were introduced in Open GL ES 3.0 and these have to be checked for properly. Change-Id: I88c5c7478e5358c22b4ffce8939d1adb926ce9df Reviewed-on: https://swiftshader-review.googlesource.com/3017Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Update checks for compressed formats
6a7c6728 · Alexis Hetu · Alexis Hétu · 8be7e3f3 · 6a7c6728 · 6a7c6728
Commit 6a7c6728 authored Apr 30, 2015 by Alexis Hetu Committed by Alexis Hétu May 03, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 1 deletion

libGLESv3.cpp src/OpenGL/libGLESv2/libGLESv3.cpp +10 -0

utilities.cpp src/OpenGL/libGLESv2/utilities.cpp +11 -1

No files found.
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -153,6 +153,16 @@ static bool validateColorBufferFormat(GLenum textureFormat, GLenum colorbufferFo
 		}
 		break;
 	case GL_ETC1_RGB8_OES:
+	case GL_COMPRESSED_R11_EAC:
+	case GL_COMPRESSED_SIGNED_R11_EAC:
+	case GL_COMPRESSED_RG11_EAC:
+	case GL_COMPRESSED_SIGNED_RG11_EAC:
+	case GL_COMPRESSED_RGB8_ETC2:
+	case GL_COMPRESSED_SRGB8_ETC2:
+	case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+	case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+	case GL_COMPRESSED_RGBA8_ETC2_EAC:
+	case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
 		return error(GL_INVALID_OPERATION, false);
 	case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
 	case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

--- a/src/OpenGL/libGLESv2/utilities.cpp
+++ b/src/OpenGL/libGLESv2/utilities.cpp
@@ -197,7 +197,17 @@ namespace es2
 		       format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ||
               format == GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE ||
               format == GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE ||
-               format == GL_ETC1_RGB8_OES;
+               format == GL_ETC1_RGB8_OES ||
+               format == GL_COMPRESSED_R11_EAC ||
+               format == GL_COMPRESSED_SIGNED_R11_EAC ||
+               format == GL_COMPRESSED_RG11_EAC ||
+               format == GL_COMPRESSED_SIGNED_RG11_EAC ||
+               format == GL_COMPRESSED_RGB8_ETC2 ||
+               format == GL_COMPRESSED_SRGB8_ETC2 ||
+               format == GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 ||
+               format == GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 ||
+               format == GL_COMPRESSED_RGBA8_ETC2_EAC ||
+               format == GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC;
 	}

 	bool IsDepthTexture(GLenum format)