Title: [123749] trunk/Source/WebCore
Revision
123749
Author
[email protected]
Date
2012-07-26 08:25:47 -0700 (Thu, 26 Jul 2012)

Log Message

[WebGL] ANGLEWebKitBridge should support ESSL platforms
https://bugs.webkit.org/show_bug.cgi?id=92295

Patch by Joshua Netterfield <[email protected]> on 2012-07-26
Reviewed by Rob Buis.

This tells ANGLEWebKitBridge to output ESSL code for the BlackBerry
platform. This eliminates the need for a previous hack. In addition,
some (GLSL) ANGLE output that could not be compiled (for example,
glsl-mat4-to-mat3.html) now compiles.

* platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (123748 => 123749)


--- trunk/Source/WebCore/ChangeLog	2012-07-26 15:21:58 UTC (rev 123748)
+++ trunk/Source/WebCore/ChangeLog	2012-07-26 15:25:47 UTC (rev 123749)
@@ -1,3 +1,20 @@
+2012-07-26  Joshua Netterfield  <[email protected]>
+
+        [WebGL] ANGLEWebKitBridge should support ESSL platforms
+        https://bugs.webkit.org/show_bug.cgi?id=92295
+
+        Reviewed by Rob Buis.
+
+        This tells ANGLEWebKitBridge to output ESSL code for the BlackBerry
+        platform. This eliminates the need for a previous hack. In addition,
+        some (GLSL) ANGLE output that could not be compiled (for example,
+        glsl-mat4-to-mat3.html) now compiles.
+
+        * platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+        (WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):
+
 2012-07-26  Pavel Feldman  <[email protected]>
 
         Web Inspector: replace "textInput" keyboard event listener breakpoint with "input"

Modified: trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp (123748 => 123749)


--- trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp	2012-07-26 15:21:58 UTC (rev 123748)
+++ trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp	2012-07-26 15:25:47 UTC (rev 123749)
@@ -54,6 +54,7 @@
     : m_currentWidth(0)
     , m_currentHeight(0)
     , m_context(BlackBerry::Platform::Graphics::createWebGLContext())
+    , m_compiler(SH_ESSL_OUTPUT)
     , m_extensions(adoptPtr(new Extensions3DOpenGLES(this)))
     , m_attrs(attrs)
     , m_texture(0)

Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (123748 => 123749)


--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2012-07-26 15:21:58 UTC (rev 123748)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2012-07-26 15:25:47 UTC (rev 123749)
@@ -130,16 +130,6 @@
     if (!isValid)
         return "";
 
-#if PLATFORM(BLACKBERRY)
-    // Our hardware really likes being told what precision to have (i.e., with "precision * float")
-    // ANGLE strips this information.
-    if (entry.source.contains("precision lowp float"))
-        translatedShaderSource = "precision lowp float;\n" + translatedShaderSource;
-    else if (entry.source.contains("precision mediump float"))
-        translatedShaderSource = "precision mediump float;\n" + translatedShaderSource;
-    else
-        translatedShaderSource = "precision highp float;\n" + translatedShaderSource;
-#endif
     return translatedShaderSource;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to