Fix workaround formats not being used when EXT_texture_storage is emulated.

This bug showed up on Mac which doesn't support the extension. The internalFormat is correctly translated to the workaround format but the format and type are not. BUG=angleproject:1958 Change-Id: I9b31f0491df1bb623bf59996cbb02d0276b6355c Reviewed-on: https://chromium-review.googlesource.com/488582Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Fix workaround formats not being used when EXT_texture_storage is emulated.
e8b35512 · Geoff Lang · Commit Bot · 876429b7 · e8b35512
Commit e8b35512 authored Apr 27, 2017 by Geoff Lang Committed by Commit Bot Apr 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 35 additions and 12 deletions

TextureGL.cpp src/libANGLE/renderer/gl/TextureGL.cpp +35 -12

No files found.
--- a/src/libANGLE/renderer/gl/TextureGL.cpp
+++ b/src/libANGLE/renderer/gl/TextureGL.cpp
@@ -736,21 +736,29 @@ gl::Error TextureGL::setStorage(ContextImpl *contextImpl,
                {
                    if (internalFormatInfo.compressed)
                    {
+                        nativegl::CompressedTexSubImageFormat compressedTexImageFormat =
+                            nativegl::GetCompressedSubTexImageFormat(mFunctions, mWorkarounds,
+                                                                     internalFormat);
+
                        GLuint dataSize = 0;
                        ANGLE_TRY_RESULT(internalFormatInfo.computeCompressedImageSize(
                                             GL_UNSIGNED_BYTE, levelSize),
                                         dataSize);
                        mFunctions->compressedTexImage2D(target, static_cast<GLint>(level),
-                                                         texStorageFormat.internalFormat,
+                                                         compressedTexImageFormat.format,
                                                         levelSize.width, levelSize.height, 0,
                                                         static_cast<GLsizei>(dataSize), nullptr);
                    }
                    else
                    {
+                        nativegl::TexImageFormat texImageFormat = nativegl::GetTexImageFormat(
+                            mFunctions, mWorkarounds, internalFormat, internalFormatInfo.format,
+                            internalFormatInfo.type);
+
                        mFunctions->texImage2D(target, static_cast<GLint>(level),
-                                               texStorageFormat.internalFormat, levelSize.width,
-                                               levelSize.height, 0, internalFormatInfo.format,
-                                               internalFormatInfo.type, nullptr);
+                                               texImageFormat.internalFormat, levelSize.width,
+                                               levelSize.height, 0, texImageFormat.format,
+                                               texImageFormat.type, nullptr);
                    }
                }
                else if (getTarget() == GL_TEXTURE_CUBE_MAP)
@@ -759,21 +767,29 @@ gl::Error TextureGL::setStorage(ContextImpl *contextImpl,
                    {
                        if (internalFormatInfo.compressed)
                        {
+                            nativegl::CompressedTexSubImageFormat compressedTexImageFormat =
+                                nativegl::GetCompressedSubTexImageFormat(mFunctions, mWorkarounds,
+                                                                         internalFormat);
+
                            GLuint dataSize = 0;
                            ANGLE_TRY_RESULT(internalFormatInfo.computeCompressedImageSize(
                                                 GL_UNSIGNED_BYTE, levelSize),
                                             dataSize);
                            mFunctions->compressedTexImage2D(
-                                face, static_cast<GLint>(level), texStorageFormat.internalFormat,
+                                face, static_cast<GLint>(level), compressedTexImageFormat.format,
                                levelSize.width, levelSize.height, 0,
                                static_cast<GLsizei>(dataSize), nullptr);
                        }
                        else
                        {
+                            nativegl::TexImageFormat texImageFormat = nativegl::GetTexImageFormat(
+                                mFunctions, mWorkarounds, internalFormat, internalFormatInfo.format,
+                                internalFormatInfo.type);
+
                            mFunctions->texImage2D(face, static_cast<GLint>(level),
-                                                   texStorageFormat.internalFormat, levelSize.width,
-                                                   levelSize.height, 0, internalFormatInfo.format,
-                                                   internalFormatInfo.type, nullptr);
+                                                   texImageFormat.internalFormat, levelSize.width,
+                                                   levelSize.height, 0, texImageFormat.format,
+                                                   texImageFormat.type, nullptr);
                        }
                    }
                }
@@ -811,21 +827,28 @@ gl::Error TextureGL::setStorage(ContextImpl *contextImpl,

                if (internalFormatInfo.compressed)
                {
+                    nativegl::CompressedTexSubImageFormat compressedTexImageFormat =
+                        nativegl::GetCompressedSubTexImageFormat(mFunctions, mWorkarounds,
+                                                                 internalFormat);
+
                    GLuint dataSize = 0;
                    ANGLE_TRY_RESULT(
                        internalFormatInfo.computeCompressedImageSize(GL_UNSIGNED_BYTE, levelSize),
                        dataSize);
-                    mFunctions->compressedTexImage3D(target, i, texStorageFormat.internalFormat,
+                    mFunctions->compressedTexImage3D(target, i, compressedTexImageFormat.format,
                                                     levelSize.width, levelSize.height,
                                                     levelSize.depth, 0,
                                                     static_cast<GLsizei>(dataSize), nullptr);
                }
                else
                {
-                    mFunctions->texImage3D(target, i, texStorageFormat.internalFormat,
+                    nativegl::TexImageFormat texImageFormat = nativegl::GetTexImageFormat(
+                        mFunctions, mWorkarounds, internalFormat, internalFormatInfo.format,
+                        internalFormatInfo.type);
+
+                    mFunctions->texImage3D(target, i, texImageFormat.internalFormat,
                                           levelSize.width, levelSize.height, levelSize.depth, 0,
-                                           internalFormatInfo.format, internalFormatInfo.type,
-                                           nullptr);
+                                           texImageFormat.format, texImageFormat.type, nullptr);
                }
            }
        }