Skip to content

S
swiftshader
Commit 4aea88cf by Nicolas Capens Committed by Nicolas Capens
Options

Fix missing sized internal formats.

Change-Id: Ifeee2d5c637586e6b843080aaceb446bd0b5af11 Reviewed-on: https://swiftshader-review.googlesource.com/18048Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent 667ab103
Showing with 34 additions and 4 deletions
src/OpenGL/common/Image.cpp
...@@ -247,9 +247,15 @@ namespace gl ...@@ -247,9 +247,15 @@ namespace gl
case GL_RGBA32UI: return GL_RGBA; case GL_RGBA32UI: return GL_RGBA;
// GL_EXT_texture_storage // GL_EXT_texture_storage
case GL_ALPHA8_EXT: return GL_ALPHA; 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_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 case GL_BGRA8_EXT: return GL_BGRA_EXT; // GL_APPLE_texture_format_BGRA8888
......
src/OpenGL/libGLESv2/utilities.cpp
...@@ -383,8 +383,14 @@ namespace es2 ...@@ -383,8 +383,14 @@ namespace es2
switch(internalformat) switch(internalformat)
{ {
case GL_ALPHA8_EXT: case GL_ALPHA8_EXT:
case GL_LUMINANCE8_ALPHA8_EXT:
case GL_LUMINANCE8_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_R8:
case GL_R8UI: case GL_R8UI:
case GL_R8I: case GL_R8I:
...@@ -1209,6 +1215,12 @@ namespace es2 ...@@ -1209,6 +1215,12 @@ namespace es2
case GL_ALPHA8_EXT: case GL_ALPHA8_EXT:
case GL_LUMINANCE8_EXT: case GL_LUMINANCE8_EXT:
case GL_LUMINANCE8_ALPHA8_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_COMPONENT24:
case GL_DEPTH_COMPONENT32_OES: case GL_DEPTH_COMPONENT32_OES:
case GL_DEPTH_COMPONENT32F: case GL_DEPTH_COMPONENT32F:
...@@ -1378,6 +1390,12 @@ namespace es2 ...@@ -1378,6 +1390,12 @@ namespace es2
case GL_ALPHA8_EXT: case GL_ALPHA8_EXT:
case GL_LUMINANCE8_EXT: case GL_LUMINANCE8_EXT:
case GL_LUMINANCE8_ALPHA8_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; return true;
default: default:
return IsColorRenderable(internalformat, clientVersion); return IsColorRenderable(internalformat, clientVersion);
...@@ -1665,6 +1683,12 @@ namespace es2 ...@@ -1665,6 +1683,12 @@ namespace es2
case GL_RGBA16I: case GL_RGBA16I:
case GL_RGBA32I: case GL_RGBA32I:
return GL_INT; 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_R16F:
case GL_RG16F: case GL_RG16F:
case GL_R11F_G11F_B10F: case GL_R11F_G11F_B10F:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment