Title: [118788] trunk/Source/WebCore
- Revision
- 118788
- Author
- [email protected]
- Date
- 2012-05-29 09:20:46 -0700 (Tue, 29 May 2012)
Log Message
[Qt] Uninitialized shader compiler when GLES is used
https://bugs.webkit.org/show_bug.cgi?id=87712
The '#if !defined(QT_OPENGL_ES_2)' has been removed before the initialization
of shader compiler to compile shader codes for ES-platforms as well.
Patch by Roland Takacs <[email protected]> on 2012-05-29
Reviewed by Noam Rosenthal.
* platform/graphics/qt/GraphicsContext3DQt.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (118787 => 118788)
--- trunk/Source/WebCore/ChangeLog 2012-05-29 16:17:54 UTC (rev 118787)
+++ trunk/Source/WebCore/ChangeLog 2012-05-29 16:20:46 UTC (rev 118788)
@@ -1,3 +1,16 @@
+2012-05-29 Roland Takacs <[email protected]>
+
+ [Qt] Uninitialized shader compiler when GLES is used
+ https://bugs.webkit.org/show_bug.cgi?id=87712
+
+ The '#if !defined(QT_OPENGL_ES_2)' has been removed before the initialization
+ of shader compiler to compile shader codes for ES-platforms as well.
+
+ Reviewed by Noam Rosenthal.
+
+ * platform/graphics/qt/GraphicsContext3DQt.cpp:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+
2012-05-29 Taiju Tsuiki <[email protected]>
Add InspectorFileSystemAgent::FrontendProvider
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (118787 => 118788)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2012-05-29 16:17:54 UTC (rev 118787)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2012-05-29 16:20:46 UTC (rev 118788)
@@ -322,7 +322,6 @@
#endif
}
-#if !defined(QT_OPENGL_ES_2)
// ANGLE initialization.
ShBuiltInResources ANGLEResources;
ShInitBuiltInResources(&ANGLEResources);
@@ -339,6 +338,7 @@
ANGLEResources.MaxDrawBuffers = 1;
m_compiler.setResources(ANGLEResources);
+#if !defined(QT_OPENGL_ES_2)
glEnable(GL_POINT_SPRITE);
glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
