Changeset 92596 in webkit

Timestamp:

Aug 8, 2011 8:29:46 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Implement WebGL antialiasing (part 3)
​https://bugs.webkit.org/show_bug.cgi?id=64879

Patch by Andrew Wason <​rectalogic@rectalogic.com> on 2011-08-08
Reviewed by Noam Rosenthal.

Existing WebGL layout tests.

Adopt Extensions3DOpenGL for Qt desktop as a prerequisite
for implementing WebGL antialiasing.
Extensions3DQt is still used for ES2.

• WebCore.pri:
• WebCore.pro:
• platform/graphics/GraphicsContext3D.h:
• platform/graphics/opengl/Extensions3DOpenGL.cpp:

(WebCore::Extensions3DOpenGL::createVertexArrayOES):
(WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
(WebCore::Extensions3DOpenGL::isVertexArrayOES):
(WebCore::Extensions3DOpenGL::bindVertexArrayOES):

• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::getExtensions):

• platform/graphics/qt/GraphicsContext3DQt.cpp:

(WebCore::GraphicsContext3D::layerComposited):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pri (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• platform/graphics/GraphicsContext3D.h (modified) (2 diffs)
• platform/graphics/opengl/Extensions3DOpenGL.cpp (modified) (5 diffs)
• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (modified) (2 diffs)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-08  Andrew Wason  <rectalogic@rectalogic.com>
+
+        [Qt] Implement WebGL antialiasing (part 3)
+        https://bugs.webkit.org/show_bug.cgi?id=64879
+
+        Reviewed by Noam Rosenthal.
+
+        Existing WebGL layout tests.
+
+        Adopt Extensions3DOpenGL for Qt desktop as a prerequisite
+        for implementing WebGL antialiasing.
+        Extensions3DQt is still used for ES2.
+
+        * WebCore.pri:
+        * WebCore.pro:
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+        (WebCore::Extensions3DOpenGL::createVertexArrayOES):
+        (WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
+        (WebCore::Extensions3DOpenGL::isVertexArrayOES):
+        (WebCore::Extensions3DOpenGL::bindVertexArrayOES):
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::getExtensions):
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::layerComposited):
+
 2011-08-08  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/WebCore.pri

@@ -125 +125 @@
     $$SOURCE_DIR/WebCore/bridge/qt \
     $$SOURCE_DIR/WebCore/page/qt \
+    $$SOURCE_DIR/WebCore/platform/graphics/opengl \
     $$SOURCE_DIR/WebCore/platform/graphics/qt \
     $$SOURCE_DIR/WebCore/platform/network/qt \

trunk/Source/WebCore/WebCore.pro

@@ -3660 +3660 @@
 
     !contains(QT_CONFIG, opengles2) {
+        HEADERS += \
+            platform/graphics/opengl/Extensions3DOpenGL.h
+
         SOURCES += \
+            platform/graphics/opengl/Extensions3DOpenGL.cpp \
             platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
 

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -89 +89 @@
 class DrawingBuffer;
 class Extensions3D;
-#if PLATFORM(MAC) || PLATFORM(GTK)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT)
 class Extensions3DOpenGL;
-#elif PLATFORM(QT)
+#endif
+#if PLATFORM(QT)
 class Extensions3DQt;
 #endif
@@ -919 +920 @@
 
     ANGLEWebKitBridge m_compiler;
-#if PLATFORM(QT)
+#if PLATFORM(QT) && defined(QT_OPENGL_ES_2)
     friend class Extensions3DQt;
     OwnPtr<Extensions3DQt> m_extensions;

trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

@@ -38 +38 @@
 #elif PLATFORM(GTK)
 #include "OpenGLShims.h"
+#elif PLATFORM(QT)
+#include <cairo/OpenGLShims.h>
 #endif
 
@@ -148 +150 @@
 {
     m_context->makeContextCurrent();
-#if !PLATFORM(GTK) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
+#if !PLATFORM(GTK) && !PLATFORM(QT) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
     GLuint array = 0;
     glGenVertexArraysAPPLE(1, &array);
@@ -163 +165 @@
     
     m_context->makeContextCurrent();
-#if !PLATFORM(GTK) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
+#if !PLATFORM(GTK) && !PLATFORM(QT) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
     glDeleteVertexArraysAPPLE(1, &array);
 #endif
@@ -174 +176 @@
     
     m_context->makeContextCurrent();
-#if !PLATFORM(GTK) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
+#if !PLATFORM(GTK) && !PLATFORM(QT) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
     return glIsVertexArrayAPPLE(array);
 #else
@@ -187 +189 @@
 
     m_context->makeContextCurrent();
-#if !PLATFORM(GTK) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
+#if !PLATFORM(GTK) && !PLATFORM(QT) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
     glBindVertexArrayAPPLE(array);
 #endif

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

@@ -1524 +1524 @@
 }
 
-#if !PLATFORM(QT)
 Extensions3D* GraphicsContext3D::getExtensions()
 {
@@ -1531 +1530 @@
     return m_extensions.get();
 }
-#endif
 
 }

trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -24 +24 @@
 #include <cairo/OpenGLShims.h>
 #include "CanvasRenderingContext.h"
+#if defined(QT_OPENGL_ES_2)
 #include "Extensions3DQt.h"
+#else
+#include "Extensions3DOpenGL.h"
+#endif
 #include "GraphicsContext.h"
 #include "HTMLCanvasElement.h"
@@ -1496 +1500 @@
     return m_layerComposited;
 }
-#endif
 
 Extensions3D* GraphicsContext3D::getExtensions()
@@ -1504 +1507 @@
     return m_extensions.get();
 }
+#endif
 
 bool GraphicsContext3D::getImageData(Image* image,