Attachment 103106 Details for Bug 64879 – adopt Extensions3DOpenGL

[patch] adopt Extensions3DOpenGL

extensions.diff (text/plain), 6.96 KB, created by Andrew Wason on 2011-08-05 14:01:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Wason

Created: 2011-08-05 14:01:10 PDT

Size: 6.96 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 84293fd..5a9fb74 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,27 @@
>+2011-08-05  Andrew Wason  <rectalogic@rectalogic.com>
>+
>+        [Qt] Implement WebGL antialiasing (part 3)
>+        https://bugs.webkit.org/show_bug.cgi?id=64879
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Existing WebGL layout tests.
>+
>+        Adopt Extensions3DOpenGL for Qt antialiasing support.
>+
>+        * 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-05  Keishi Hattori  <keishi@webkit.org>
> 
>         Implement <input type=color> UI behavior WebCore part
>diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
>index a0dedd8..25fdf31 100644
>--- a/Source/WebCore/WebCore.pri
>+++ b/Source/WebCore/WebCore.pri
>@@ -124,6 +124,7 @@ WEBCORE_INCLUDEPATH = \
> WEBCORE_INCLUDEPATH = \
>     $$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 \
>     $$SOURCE_DIR/WebCore/platform/qt \
>diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
>index 7008c21..080810a 100644
>--- a/Source/WebCore/WebCore.pro
>+++ b/Source/WebCore/WebCore.pro
>@@ -3659,7 +3659,11 @@ contains(DEFINES, ENABLE_WEBGL=1) {
>     INCLUDEPATH += $$PWD/platform/graphics/gpu
> 
>     !contains(QT_CONFIG, opengles2) {
>+        HEADERS += \
>+            platform/graphics/opengl/Extensions3DOpenGL.h
>+
>         SOURCES += \
>+            platform/graphics/opengl/Extensions3DOpenGL.cpp \
>             platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
> 
>         ANGLE_DIR = $$replace(PWD, "WebCore", "ThirdParty/ANGLE")
>diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.h b/Source/WebCore/platform/graphics/GraphicsContext3D.h
>index f86a2f8..5fc6e6b 100644
>--- a/Source/WebCore/platform/graphics/GraphicsContext3D.h
>+++ b/Source/WebCore/platform/graphics/GraphicsContext3D.h
>@@ -88,9 +88,10 @@ namespace WebCore {
> class CanvasRenderingContext;
> 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
> class HostWindow;
>@@ -918,7 +919,7 @@ public:
>     HashMap<Platform3DObject, ShaderSourceEntry> m_shaderSourceMap;
> 
>     ANGLEWebKitBridge m_compiler;
>-#if PLATFORM(QT)
>+#if PLATFORM(QT) && defined(QT_OPENGL_ES_2)
>     friend class Extensions3DQt;
>     OwnPtr<Extensions3DQt> m_extensions;
> #else
>diff --git a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
>index 4c7164e..7ded6a7 100644
>--- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
>@@ -37,6 +37,8 @@
> #include <OpenGL/gl.h>
> #elif PLATFORM(GTK)
> #include "OpenGLShims.h"
>+#elif PLATFORM(QT)
>+#include <cairo/OpenGLShims.h>
> #endif
> 
> namespace WebCore {
>@@ -147,7 +149,7 @@ void Extensions3DOpenGL::renderbufferStorageMultisample(unsigned long target, un
> Platform3DObject Extensions3DOpenGL::createVertexArrayOES()
> {
>     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);
>     return array;
>@@ -162,7 +164,7 @@ void Extensions3DOpenGL::deleteVertexArrayOES(Platform3DObject array)
>         return;
>     
>     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
> }
>@@ -173,7 +175,7 @@ GC3Dboolean Extensions3DOpenGL::isVertexArrayOES(Platform3DObject array)
>         return GL_FALSE;
>     
>     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
>     return GL_FALSE;
>@@ -186,7 +188,7 @@ void Extensions3DOpenGL::bindVertexArrayOES(Platform3DObject array)
>         return;
> 
>     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
> }
>diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
>index d91fb66..f7a76e0c 100644
>--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
>@@ -1523,14 +1523,12 @@ bool GraphicsContext3D::layerComposited() const
>     return m_layerComposited;
> }
> 
>-#if !PLATFORM(QT)
> Extensions3D* GraphicsContext3D::getExtensions()
> {
>     if (!m_extensions)
>         m_extensions = adoptPtr(new Extensions3DOpenGL(this));
>     return m_extensions.get();
> }
>-#endif
> 
> }
> 
>diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
>index 7e41871..e972030 100644
>--- a/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
>+++ b/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
>@@ -23,7 +23,11 @@
> #include "WebGLObject.h"
> #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"
> #include "HostWindow.h"
>@@ -1495,7 +1499,6 @@ bool GraphicsContext3D::layerComposited() const
> {
>     return m_layerComposited;
> }
>-#endif
> 
> Extensions3D* GraphicsContext3D::getExtensions()
> {
>@@ -1503,6 +1506,7 @@ Extensions3D* GraphicsContext3D::getExtensions()
>         m_extensions = adoptPtr(new Extensions3DQt);
>     return m_extensions.get();
> }
>+#endif
> 
> bool GraphicsContext3D::getImageData(Image* image,
>                                      GC3Denum format,

Flags:

noam: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 64879: 103072 | 103106 | 103107 | 103240 | 103241 | 103248 | 103253