GL: Fix usage of glGetInternalFormativ.

The Target was being passed cube map faces for cube map textures. The return value is an enum, not a bool. BUG=angleproject:1932 Change-Id: I975f510fc0f6bc4d29adcbb152b0329ecbcdfa92 Reviewed-on: https://chromium-review.googlesource.com/902192Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

GL: Fix usage of glGetInternalFormativ.
a8fe18fc · Geoff Lang · Commit Bot · b5420664 · a8fe18fc · a8fe18fc
Commit a8fe18fc authored Feb 05, 2018 by Geoff Lang Committed by Commit Bot Feb 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

TextureGL.cpp src/libANGLE/renderer/gl/TextureGL.cpp +1 -1

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +2 -2

No files found.
--- a/src/libANGLE/renderer/gl/TextureGL.cpp
+++ b/src/libANGLE/renderer/gl/TextureGL.cpp
@@ -793,7 +793,7 @@ gl::Error TextureGL::copySubTextureHelper(const gl::Context *context,
    // Check if the destination is renderable and copy on the GPU
    const LevelInfoGL &destLevelInfo = getLevelInfo(target, level);
    if (!destSRGB &&
-        nativegl::SupportsNativeRendering(mFunctions, target, destLevelInfo.nativeInternalFormat))
+        nativegl::SupportsNativeRendering(mFunctions, getTarget(), destLevelInfo.nativeInternalFormat))
    {
        return mBlitter->copySubTexture(context, sourceGL, sourceLevel, sourceComponentType, this,
                                        target, level, destComponentType, sourceImageDesc.size,

--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1208,10 +1208,10 @@ bool SupportsNativeRendering(const FunctionsGL *functions, GLenum target, GLenum
    if (functions->isAtLeastGL(gl::Version(4, 3)) ||
        functions->hasGLExtension("GL_ARB_internalformat_query2"))
    {
-        GLint framebufferRenderable = GL_FALSE;
+        GLint framebufferRenderable = GL_NONE;
        functions->getInternalformativ(target, internalFormat, GL_FRAMEBUFFER_RENDERABLE, 1,
                                       &framebufferRenderable);
-        return gl::ConvertToBool(framebufferRenderable);
+        return framebufferRenderable != GL_NONE;
    }
    else
    {