diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-04-30 08:23:07 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-30 10:40:31 +0200 |
| commit | 23fc33e202162bdbe39173744407cc0b98eab66a (patch) | |
| tree | 4d366919e7fd425aff9806a716694e19b65cd873 /Source/JavaScriptCore/API/JavaScript.h | |
| parent | 79318124ab940b5b286ec9e1b1f4c8533324c5a8 (diff) | |
| download | qtwebkit-23fc33e202162bdbe39173744407cc0b98eab66a.tar.gz | |
Fix the USE(3D_GRAPHICS) build with the standard OpenGL on Windows
https://bugs.webkit.org/show_bug.cgi?id=114684
Reviewed by Simon Hausmann.
Source/WebCore:
Currently USE(3D_GRAPHICS) is only supported with OpenGLES through ANGLE
on Windows. Allow building with the stock opengl32.lib on Windows by adding
missing glCompressedTex* entries in OpenGLShims.
Those are used in Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
and will be substituted by the preprocessor.
* platform/graphics/OpenGLShims.cpp:
(WebCore::initializeOpenGLShims):
* platform/graphics/OpenGLShims.h:
(_OpenGLFunctionTable):
Tools:
Remove the ANGLE requirement for USE(3D_GRAPHICS).
This enables WebKit2 in the build when using a "-opengl desktop" configured Qt.
* qmake/mkspecs/features/features.prf:
Change-Id: Ia4a8f37944eb2cc168bc2428179f826167448e5c
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/API/JavaScript.h')
0 files changed, 0 insertions, 0 deletions