Changeset 195225 in webkit

Timestamp:

Jan 18, 2016, 5:38:27 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r194751 - Correct missing EXT_sRGB Format Handling
​https://bugs.webkit.org/show_bug.cgi?id=152876
<rdar://problem/23284389>

Reviewed by Alex Christensen.

Tested by WebGL 1.0.4 suite.

• platform/graphics/GraphicsContext3D.cpp:

(getDataFormat): Handle missing SRGB and SRGB_ALPHA cases.

• platform/graphics/GraphicsContext3D.h: Add missing SRGB_ALPHA value from the Khronos standard.
• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::texImage2D): Add an assertion that we are not being handed
an internal format to a method that works with normal formats.

Location:

releases/WebKitGTK/webkit-2.10/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext3D.cpp (modified) (3 diffs)
• platform/graphics/GraphicsContext3D.h (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-07  Brent Fulgham  <bfulgham@apple.com>
+
+        Correct missing EXT_sRGB Format Handling
+        https://bugs.webkit.org/show_bug.cgi?id=152876
+        <rdar://problem/23284389>
+
+        Reviewed by Alex Christensen.
+
+        Tested by WebGL 1.0.4 suite.
+
+        * platform/graphics/GraphicsContext3D.cpp:
+        (getDataFormat): Handle missing SRGB and SRGB_ALPHA cases.
+        * platform/graphics/GraphicsContext3D.h: Add missing SRGB_ALPHA value from the Khronos standard.
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::texImage2D): Add an assertion that we are not being handed
+        an internal format to a method that works with normal formats.
+
 2016-01-07  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsContext3D.cpp

@@ -63 +63 @@
             dstFormat = GraphicsContext3D::DataFormatRA8;
             break;
+        case GraphicsContext3D::SRGB:
+            dstFormat = GraphicsContext3D::DataFormatRGB8;
+            break;
+        case GraphicsContext3D::SRGB_ALPHA:
+            dstFormat = GraphicsContext3D::DataFormatRGBA8;
+            break;
         default:
             ASSERT_NOT_REACHED();
@@ -93 +99 @@
             dstFormat = GraphicsContext3D::DataFormatRA16F;
             break;
+        case GraphicsContext3D::SRGB:
+            dstFormat = GraphicsContext3D::DataFormatRGB16F;
+            break;
+        case GraphicsContext3D::SRGB_ALPHA:
+            dstFormat = GraphicsContext3D::DataFormatRGBA16F;
+            break;
         default:
             ASSERT_NOT_REACHED();
@@ -113 +125 @@
         case GraphicsContext3D::LUMINANCE_ALPHA:
             dstFormat = GraphicsContext3D::DataFormatRA32F;
+            break;
+        case GraphicsContext3D::SRGB:
+            dstFormat = GraphicsContext3D::DataFormatRGB32F;
+            break;
+        case GraphicsContext3D::SRGB_ALPHA:
+            dstFormat = GraphicsContext3D::DataFormatRGBA32F;
             break;
         default:

releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -505 +505 @@
         SRGB = 0x8C40,
         SRGB8 = 0x8C41,
+        SRGB_ALPHA = 0x8C42,
         SRGB8_ALPHA8 = 0x8C43,
         COMPARE_REF_TO_TEXTURE = 0x884E,

releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

@@ -345 +345 @@
     }
 
+    ASSERT(format != Extensions3D::SRGB8_ALPHA8_EXT);
     if (format == Extensions3D::SRGB_ALPHA_EXT)
         openGLFormat = GL_RGBA;