Always update HALF_FLOAT_OES type to HALF_FLOAT on Desktop GL.

TEST=webgl_conformance_gl_passthrough_tests on Linux/Windows BUG=angleproject:2231 Change-Id: I17c7d693e2b75726e2478925e0f22963de6ab819 Reviewed-on: https://chromium-review.googlesource.com/763987Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Always update HALF_FLOAT_OES type to HALF_FLOAT on Desktop GL.
225bfa95 · Geoff Lang · Commit Bot · ee6884e7 · 225bfa95
Commit 225bfa95 authored Nov 10, 2017 by Geoff Lang Committed by Commit Bot Nov 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

formatutilsgl.cpp src/libANGLE/renderer/gl/formatutilsgl.cpp +11 -3

No files found.
--- a/src/libANGLE/renderer/gl/formatutilsgl.cpp
+++ b/src/libANGLE/renderer/gl/formatutilsgl.cpp
@@ -430,7 +430,16 @@ static GLenum GetNativeType(const FunctionsGL *functions,
 {
    GLenum result = type;

-    if (functions->standard == STANDARD_GL_DESKTOP || functions->isAtLeastGLES(gl::Version(3, 0)))
+    if (functions->standard == STANDARD_GL_DESKTOP)
+    {
+        if (type == GL_HALF_FLOAT_OES)
+        {
+            // The enums differ for the OES half float extensions and desktop GL spec.
+            // Update it.
+            result = GL_HALF_FLOAT;
+        }
+    }
+    else if (functions->isAtLeastGLES(gl::Version(3, 0)))
    {
        if (type == GL_HALF_FLOAT_OES)
        {
@@ -442,9 +451,8 @@ static GLenum GetNativeType(const FunctionsGL *functions,
                    // In ES3, these formats come from EXT_texture_storage, which uses
                    // HALF_FLOAT_OES. Other formats (like RGBA) use HALF_FLOAT (non-OES) in ES3.
                    break;
+
                default:
-                    // The enums differ for the OES half float extensions and desktop GL spec.
-                    // Update it.
                    result = GL_HALF_FLOAT;
                    break;
            }