Title: [135607] trunk/Source/WebCore
Revision
135607
Author
[email protected]
Date
2012-11-23 07:11:56 -0800 (Fri, 23 Nov 2012)

Log Message

[Qt] GraphicsContext3DQt should not overwrite glClearColor of sharing context.
https://bugs.webkit.org/show_bug.cgi?id=103135

In case we use GraphicsContext3DQt to render into or
read from an existing context, we should not reset
the glClearColor on construction.
Otherwise we might overwrite an existing definition from
the sharing context.

Reviewed by Kenneth Rohde Christiansen.

* platform/graphics/qt/GraphicsContext3DQt.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (135606 => 135607)


--- trunk/Source/WebCore/ChangeLog	2012-11-23 15:01:35 UTC (rev 135606)
+++ trunk/Source/WebCore/ChangeLog	2012-11-23 15:11:56 UTC (rev 135607)
@@ -1,3 +1,19 @@
+2012-11-23  Zeno Albisser  <[email protected]>
+
+        [Qt] GraphicsContext3DQt should not overwrite glClearColor of sharing context.
+        https://bugs.webkit.org/show_bug.cgi?id=103135
+
+        In case we use GraphicsContext3DQt to render into or
+        read from an existing context, we should not reset
+        the glClearColor on construction.
+        Otherwise we might overwrite an existing definition from
+        the sharing context.
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2012-11-23  Pavel Feldman  <[email protected]>
 
         Web Inspector: damaging last chunk does not remove its garbage from DOM

Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (135606 => 135607)


--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp	2012-11-23 15:01:35 UTC (rev 135606)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp	2012-11-23 15:11:56 UTC (rev 135607)
@@ -414,7 +414,8 @@
     glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
 #endif
 
-    glClearColor(0.0, 0.0, 0.0, 0.0);
+    if (renderStyle != RenderToCurrentGLContext)
+        glClearColor(0.0, 0.0, 0.0, 0.0);
 }
 
 GraphicsContext3D::~GraphicsContext3D()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to