Changeset 92596 in webkit
- Timestamp:
- Aug 8, 2011 8:29:46 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r92594 r92596 1 2011-08-08 Andrew Wason <rectalogic@rectalogic.com> 2 3 [Qt] Implement WebGL antialiasing (part 3) 4 https://bugs.webkit.org/show_bug.cgi?id=64879 5 6 Reviewed by Noam Rosenthal. 7 8 Existing WebGL layout tests. 9 10 Adopt Extensions3DOpenGL for Qt desktop as a prerequisite 11 for implementing WebGL antialiasing. 12 Extensions3DQt is still used for ES2. 13 14 * WebCore.pri: 15 * WebCore.pro: 16 * platform/graphics/GraphicsContext3D.h: 17 * platform/graphics/opengl/Extensions3DOpenGL.cpp: 18 (WebCore::Extensions3DOpenGL::createVertexArrayOES): 19 (WebCore::Extensions3DOpenGL::deleteVertexArrayOES): 20 (WebCore::Extensions3DOpenGL::isVertexArrayOES): 21 (WebCore::Extensions3DOpenGL::bindVertexArrayOES): 22 * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp: 23 (WebCore::GraphicsContext3D::getExtensions): 24 * platform/graphics/qt/GraphicsContext3DQt.cpp: 25 (WebCore::GraphicsContext3D::layerComposited): 26 1 27 2011-08-08 Benjamin Poulain <benjamin@webkit.org> 2 28 -
trunk/Source/WebCore/WebCore.pri
r92555 r92596 125 125 $$SOURCE_DIR/WebCore/bridge/qt \ 126 126 $$SOURCE_DIR/WebCore/page/qt \ 127 $$SOURCE_DIR/WebCore/platform/graphics/opengl \ 127 128 $$SOURCE_DIR/WebCore/platform/graphics/qt \ 128 129 $$SOURCE_DIR/WebCore/platform/network/qt \ -
trunk/Source/WebCore/WebCore.pro
r92538 r92596 3660 3660 3661 3661 !contains(QT_CONFIG, opengles2) { 3662 HEADERS += \ 3663 platform/graphics/opengl/Extensions3DOpenGL.h 3664 3662 3665 SOURCES += \ 3666 platform/graphics/opengl/Extensions3DOpenGL.cpp \ 3663 3667 platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 3664 3668 -
trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h
r91694 r92596 89 89 class DrawingBuffer; 90 90 class Extensions3D; 91 #if PLATFORM(MAC) || PLATFORM(GTK) 91 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) 92 92 class Extensions3DOpenGL; 93 #elif PLATFORM(QT) 93 #endif 94 #if PLATFORM(QT) 94 95 class Extensions3DQt; 95 96 #endif … … 919 920 920 921 ANGLEWebKitBridge m_compiler; 921 #if PLATFORM(QT) 922 #if PLATFORM(QT) && defined(QT_OPENGL_ES_2) 922 923 friend class Extensions3DQt; 923 924 OwnPtr<Extensions3DQt> m_extensions; -
trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp
r83762 r92596 38 38 #elif PLATFORM(GTK) 39 39 #include "OpenGLShims.h" 40 #elif PLATFORM(QT) 41 #include <cairo/OpenGLShims.h> 40 42 #endif 41 43 … … 148 150 { 149 151 m_context->makeContextCurrent(); 150 #if !PLATFORM(GTK) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object152 #if !PLATFORM(GTK) && !PLATFORM(QT) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object 151 153 GLuint array = 0; 152 154 glGenVertexArraysAPPLE(1, &array); … … 163 165 164 166 m_context->makeContextCurrent(); 165 #if !PLATFORM(GTK) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object167 #if !PLATFORM(GTK) && !PLATFORM(QT) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object 166 168 glDeleteVertexArraysAPPLE(1, &array); 167 169 #endif … … 174 176 175 177 m_context->makeContextCurrent(); 176 #if !PLATFORM(GTK) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object178 #if !PLATFORM(GTK) && !PLATFORM(QT) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object 177 179 return glIsVertexArrayAPPLE(array); 178 180 #else … … 187 189 188 190 m_context->makeContextCurrent(); 189 #if !PLATFORM(GTK) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object191 #if !PLATFORM(GTK) && !PLATFORM(QT) && defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object 190 192 glBindVertexArrayAPPLE(array); 191 193 #endif -
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
r91694 r92596 1524 1524 } 1525 1525 1526 #if !PLATFORM(QT)1527 1526 Extensions3D* GraphicsContext3D::getExtensions() 1528 1527 { … … 1531 1530 return m_extensions.get(); 1532 1531 } 1533 #endif1534 1532 1535 1533 } -
trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
r91694 r92596 24 24 #include <cairo/OpenGLShims.h> 25 25 #include "CanvasRenderingContext.h" 26 #if defined(QT_OPENGL_ES_2) 26 27 #include "Extensions3DQt.h" 28 #else 29 #include "Extensions3DOpenGL.h" 30 #endif 27 31 #include "GraphicsContext.h" 28 32 #include "HTMLCanvasElement.h" … … 1496 1500 return m_layerComposited; 1497 1501 } 1498 #endif1499 1502 1500 1503 Extensions3D* GraphicsContext3D::getExtensions() … … 1504 1507 return m_extensions.get(); 1505 1508 } 1509 #endif 1506 1510 1507 1511 bool GraphicsContext3D::getImageData(Image* image,
Note: See TracChangeset
for help on using the changeset viewer.