diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp b/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp index d88242f96..294169e0e 100644 --- a/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp +++ b/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp @@ -24,10 +24,16 @@ #include "HostWindow.h" #include "NotImplemented.h" -#include "OpenGLShims.h" #include "PlatformContextCairo.h" #include <wtf/OwnArrayPtr.h> +#if USE(OPENGL_ES_2) +#include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> +#else +#include "OpenGLShims.h" +#endif + #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) && USE(TEXTURE_MAPPER_GL) #include <texmap/TextureMapperGL.h> #endif @@ -125,7 +131,7 @@ void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper m_context->makeContextCurrent(); m_context->resolveMultisamplingIfNecessary(); - glBindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_context->m_boundFBO); + ::glBindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_context->m_boundFBO); if (previousActiveContext && previousActiveContext != m_glContext) previousActiveContext->makeContextCurrent(); |