Changeset 148680 in webkit

Timestamp:

Apr 18, 2013 9:14:58 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Improper initialization of ANGLEResources (resubmission)
​https://bugs.webkit.org/show_bug.cgi?id=114814

Patch by Jonathan Feldstein <​jfeldstein@blackberry.com> on 2013-04-18
Reviewed by Yong Li, Rob Buis
Internally reviewed by Maxim Mogilnitsky

MaxDrawBuffers, OES_standard_derivatives, OES_EGL_image_external and ARB_texture_rectangle
are initialized through the ShBuiltInResources function so these fields do not need to be
set again in GraphicsContext3DBlackBerry.cpp. In addition, the extension flags should not
be set to true without getExtension being called (Khronos WebGL specs, section 5.14.14.).
In fact, as a direct result of these extensions being enabled prior to calling
getExtension, a WebGL conformance suite test for GL_OES_standard_derivatives was failing.

• platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:

(WebCore::GraphicsContext3D::GraphicsContext3D):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-18  Jonathan Feldstein  <jfeldstein@blackberry.com>
+
+        [BlackBerry] Improper initialization of ANGLEResources (resubmission)
+        https://bugs.webkit.org/show_bug.cgi?id=114814
+
+        Reviewed by Yong Li, Rob Buis
+        Internally reviewed by Maxim Mogilnitsky
+
+        MaxDrawBuffers, OES_standard_derivatives, OES_EGL_image_external and ARB_texture_rectangle
+        are initialized through the ShBuiltInResources function so these fields do not need to be
+        set again in GraphicsContext3DBlackBerry.cpp. In addition, the extension flags should not
+        be set to true without getExtension being called (Khronos WebGL specs, section 5.14.14.).
+        In fact, as a direct result of these extensions being enabled prior to calling
+        getExtension, a WebGL conformance suite test for GL_OES_standard_derivatives was failing.
+
+        * platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2013-04-18  Xuefei Ren  <xren@blackberry.com>
 

trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp

@@ -109 +109 @@
     getIntegerv(GraphicsContext3D::MAX_FRAGMENT_UNIFORM_VECTORS, &ANGLEResources.MaxFragmentUniformVectors);
 
-    Extensions3D* extensions = getExtensions();
-    ANGLEResources.MaxDrawBuffers = 1; // Always set to 1 for OpenGL ES.
-    ANGLEResources.OES_standard_derivatives = extensions->supports("GL_OES_standard_derivatives");
-    ANGLEResources.OES_EGL_image_external = extensions->supports("GL_EGL_image_external");
-    ANGLEResources.ARB_texture_rectangle = extensions->supports("GL_ARB_texture_rectangle");
-
     GC3Dint range[2], precision;
     getShaderPrecisionFormat(GraphicsContext3D::FRAGMENT_SHADER, GraphicsContext3D::HIGH_FLOAT, range, &precision);