commit 5e7f5c927426d2b10f13f325ef6f6fd898743727
author Geoff Lang <geofflang@chromium.org> Sat Jul 25 13:52:51 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Sat Jul 25 13:53:05 2015 +0000
tree a66b348b92ae13d73f35a0aa14267bec43fdc316
parent 8d8044f7e39839a5dfbf09553f77fd4325e64d4c

Revert "Always use sized internal formats for textures in TextureGL."

Causing failures on the Intel and AMD bot.

This reverts commit 8d8044f7e39839a5dfbf09553f77fd4325e64d4c.

Change-Id: I7dc6634eaf6f57ad84c315d74aa74d3ef2d4016f
Reviewed-on: https://chromium-review.googlesource.com/288325
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/gl/TextureGL.cpp

diff --git a/src/libANGLE/renderer/gl/TextureGL.cpp b/src/libANGLE/renderer/gl/TextureGL.cpp
index d656321..70392a7 100644
--- a/src/libANGLE/renderer/gl/TextureGL.cpp
+++ b/src/libANGLE/renderer/gl/TextureGL.cpp
@@ -55,34 +55,6 @@
     }
 }
 
-static const nativegl::InternalFormat &GetNativeInternalFormat(const FunctionsGL *functions,
-                                                               GLenum internalFormat,
-                                                               GLenum type)
-{
-    const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat);
-    if (functions->standard == STANDARD_GL_DESKTOP && formatInfo.pixelBytes == 0 &&
-        formatInfo.componentType == GL_UNSIGNED_NORMALIZED)
-    {
-        // When the format is unsized with an unsized normalized type, let the driver choose the
-        // format. This works around some issues with rounding on very low precision types.
-        return nativegl::GetInternalFormatInfo(internalFormat, functions->standard);
-    }
-    else if (functions->standard == STANDARD_GL_DESKTOP ||
-             functions->isAtLeastGLES(gl::Version(3, 0)))
-    {
-        // On Desktop GL, use sized internal formats when the component type is not unsigned
-        // normalized. Passing an internal format of GL_RGBA will generate a GL_RGBA8 texture
-        // even if the provided type is GL_FLOAT.
-        GLenum sizedFormat = gl::GetSizedInternalFormat(internalFormat, type);
-        return nativegl::GetInternalFormatInfo(sizedFormat, functions->standard);
-    }
-    else
-    {
-        // For ES2, just pass what was provided.
-        return nativegl::GetInternalFormatInfo(internalFormat, functions->standard);
-    }
-}
-
 TextureGL::TextureGL(GLenum type, const FunctionsGL *functions, StateManagerGL *stateManager)
     : TextureImpl(),
       mTextureType(type),
@@ -118,8 +90,7 @@
 
     SetUnpackStateForTexImage(mStateManager, unpack);
 
-    const nativegl::InternalFormat &nativeInternalFormatInfo =
-        GetNativeInternalFormat(mFunctions, internalFormat, type);
+    const nativegl::InternalFormat &nativeInternalFormatInfo = nativegl::GetInternalFormatInfo(internalFormat, mFunctions->standard);
 
     mStateManager->bindTexture(mTextureType, mTextureID);
     if (UseTexImage2D(mTextureType))
@@ -172,8 +143,7 @@
 
     SetUnpackStateForTexImage(mStateManager, unpack);
 
-    const nativegl::InternalFormat &nativeInternalFormatInfo =
-        GetNativeInternalFormat(mFunctions, internalFormat, GL_UNSIGNED_BYTE);
+    const nativegl::InternalFormat &nativeInternalFormatInfo = nativegl::GetInternalFormatInfo(internalFormat, mFunctions->standard);
 
     mStateManager->bindTexture(mTextureType, mTextureID);
     if (UseTexImage2D(mTextureType))
@@ -201,17 +171,19 @@
 
     SetUnpackStateForTexImage(mStateManager, unpack);
 
+    const nativegl::InternalFormat &nativeInternalFormatInfo = nativegl::GetInternalFormatInfo(format, mFunctions->standard);
+
     mStateManager->bindTexture(mTextureType, mTextureID);
     if (UseTexImage2D(mTextureType))
     {
         ASSERT(area.z == 0 && area.depth == 1);
-        mFunctions->compressedTexSubImage2D(target, level, area.x, area.y, area.width, area.height,
-                                            format, imageSize, pixels);
+        mFunctions->compressedTexSubImage2D(target, level, area.x, area.y, area.width, area.height, nativeInternalFormatInfo.internalFormat, imageSize,
+                                            pixels);
     }
     else if (UseTexImage3D(mTextureType))
     {
-        mFunctions->compressedTexSubImage3D(target, level, area.x, area.y, area.z, area.width,
-                                            area.height, area.depth, format, imageSize, pixels);
+        mFunctions->compressedTexSubImage3D(target, level, area.x, area.y, area.z, area.width, area.height, area.depth,
+                                            nativeInternalFormatInfo.internalFormat, imageSize, pixels);
     }
     else
     {
@@ -224,8 +196,7 @@
 gl::Error TextureGL::copyImage(GLenum target, size_t level, const gl::Rectangle &sourceArea, GLenum internalFormat,
                                const gl::Framebuffer *source)
 {
-    const nativegl::InternalFormat &nativeInternalFormatInfo = GetNativeInternalFormat(
-        mFunctions, internalFormat, source->getImplementationColorReadType());
+    const nativegl::InternalFormat &nativeInternalFormatInfo = nativegl::GetInternalFormatInfo(internalFormat, mFunctions->standard);
 
     const FramebufferGL *sourceFramebufferGL = GetImplAs<FramebufferGL>(source);