commit 4aea88cf6d3c5da7961bf7d117ced192fe3c56e9
author Nicolas Capens <capn@google.com> Mon Mar 26 10:13:21 2018 -0400
committer Nicolas Capens <nicolascapens@google.com> Mon Mar 26 20:26:38 2018 +0000
tree 7d8170791be9f9ff7cff61b3e7fa61b9c354ab01
parent 667ab103e907e5d99cc5d79fe80b12c93e26cc09

Fix missing sized internal formats.

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

src/OpenGL/common/Image.cpp

diff --git a/src/OpenGL/common/Image.cpp b/src/OpenGL/common/Image.cpp
index 280486a..8da7cd3 100644
--- a/src/OpenGL/common/Image.cpp
+++ b/src/OpenGL/common/Image.cpp
@@ -247,9 +247,15 @@
 		case GL_RGBA32UI: return GL_RGBA;
 
 		// GL_EXT_texture_storage
-		case GL_ALPHA8_EXT:            return GL_ALPHA;
-		case GL_LUMINANCE8_ALPHA8_EXT: return GL_LUMINANCE_ALPHA;
-		case GL_LUMINANCE8_EXT:        return GL_LUMINANCE;
+		case GL_ALPHA8_EXT:             return GL_ALPHA;
+		case GL_LUMINANCE8_EXT:         return GL_LUMINANCE;
+		case GL_LUMINANCE8_ALPHA8_EXT:  return GL_LUMINANCE_ALPHA;
+		case GL_ALPHA32F_EXT:           return GL_ALPHA;
+		case GL_LUMINANCE32F_EXT:       return GL_LUMINANCE;
+		case GL_LUMINANCE_ALPHA32F_EXT: return GL_LUMINANCE_ALPHA;
+		case GL_ALPHA16F_EXT:           return GL_ALPHA;
+		case GL_LUMINANCE16F_EXT:       return GL_LUMINANCE;
+		case GL_LUMINANCE_ALPHA16F_EXT: return GL_LUMINANCE_ALPHA;
 
 		case GL_BGRA8_EXT: return GL_BGRA_EXT;   // GL_APPLE_texture_format_BGRA8888
 

src/OpenGL/libGLESv2/utilities.cpp

diff --git a/src/OpenGL/libGLESv2/utilities.cpp b/src/OpenGL/libGLESv2/utilities.cpp
index cdd1e05..76b5b12 100644
--- a/src/OpenGL/libGLESv2/utilities.cpp
+++ b/src/OpenGL/libGLESv2/utilities.cpp
@@ -383,8 +383,14 @@
 		switch(internalformat)
 		{
 		case GL_ALPHA8_EXT:
-		case GL_LUMINANCE8_ALPHA8_EXT:
 		case GL_LUMINANCE8_EXT:
+		case GL_LUMINANCE8_ALPHA8_EXT:
+		case GL_ALPHA32F_EXT:
+		case GL_LUMINANCE32F_EXT:
+		case GL_LUMINANCE_ALPHA32F_EXT:
+		case GL_ALPHA16F_EXT:
+		case GL_LUMINANCE16F_EXT:
+		case GL_LUMINANCE_ALPHA16F_EXT:
 		case GL_R8:
 		case GL_R8UI:
 		case GL_R8I:
@@ -1209,6 +1215,12 @@
 		case GL_ALPHA8_EXT:
 		case GL_LUMINANCE8_EXT:
 		case GL_LUMINANCE8_ALPHA8_EXT:
+		case GL_ALPHA32F_EXT:
+		case GL_LUMINANCE32F_EXT:
+		case GL_LUMINANCE_ALPHA32F_EXT:
+		case GL_ALPHA16F_EXT:
+		case GL_LUMINANCE16F_EXT:
+		case GL_LUMINANCE_ALPHA16F_EXT:
 		case GL_DEPTH_COMPONENT24:
 		case GL_DEPTH_COMPONENT32_OES:
 		case GL_DEPTH_COMPONENT32F:
@@ -1378,6 +1390,12 @@
 		case GL_ALPHA8_EXT:
 		case GL_LUMINANCE8_EXT:
 		case GL_LUMINANCE8_ALPHA8_EXT:
+		case GL_ALPHA32F_EXT:
+		case GL_LUMINANCE32F_EXT:
+		case GL_LUMINANCE_ALPHA32F_EXT:
+		case GL_ALPHA16F_EXT:
+		case GL_LUMINANCE16F_EXT:
+		case GL_LUMINANCE_ALPHA16F_EXT:
 			return true;
 		default:
 			return IsColorRenderable(internalformat, clientVersion);
@@ -1665,6 +1683,12 @@
 		case GL_RGBA16I:
 		case GL_RGBA32I:
 			return GL_INT;
+		case GL_ALPHA32F_EXT:
+		case GL_LUMINANCE32F_EXT:
+		case GL_LUMINANCE_ALPHA32F_EXT:
+		case GL_ALPHA16F_EXT:
+		case GL_LUMINANCE16F_EXT:
+		case GL_LUMINANCE_ALPHA16F_EXT:
 		case GL_R16F:
 		case GL_RG16F:
 		case GL_R11F_G11F_B10F: