From eb0275098e3b8b1fbdb42def81c44e5459cd7acc Mon Sep 17 00:00:00 2001 From: "hausmann@webkit.org" Date: Tue, 26 Jun 2012 04:41:25 +0000 Subject: [PATCH] Unreviewed build fix after r121223. Fix the --minimal Qt build, TextureMapperGL now requires WebGL to be enabled. * Target.pri: * WebCore.pri: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121226 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 9 +++++++++ Source/WebCore/Target.pri | 3 +-- Source/WebCore/WebCore.pri | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 59f3999..e0fde22 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2012-06-25 Simon Hausmann + + Unreviewed build fix after r121223. + + Fix the --minimal Qt build, TextureMapperGL now requires WebGL to be enabled. + + * Target.pri: + * WebCore.pri: + 2012-06-25 Dana Jansens [chromium] CCOverdrawMetrics should use the deviceViewportSize to count actual pixels diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index 60ba3df9..0f6ec91 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -4146,7 +4146,7 @@ contains(CONFIG, texmap) { platform/graphics/texmap/TextureMapperLayer.cpp \ platform/graphics/texmap/GraphicsLayerTextureMapper.cpp - !win32-*:contains(QT_CONFIG, opengl) { + contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1) { HEADERS += \ platform/graphics/texmap/TextureMapperGL.h \ platform/graphics/texmap/TextureMapperShaderManager.h @@ -4156,7 +4156,6 @@ contains(CONFIG, texmap) { platform/graphics/texmap/TextureMapperShaderManager.cpp CONFIG += opengl-shims - DEFINES += WTF_USE_TEXTURE_MAPPER_GL } } else { HEADERS += platform/graphics/qt/GraphicsLayerQt.h diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index e2ccc61..193f5fe 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -213,7 +213,9 @@ contains(DEFINES, ENABLE_WEBGL=1) { contains(CONFIG, texmap) { DEFINES += WTF_USE_TEXTURE_MAPPER=1 - !win32-*:contains(QT_CONFIG, opengl) { + # TextureMapperGL requires stuff from GraphicsContext3D, hence the WebGL + # dependency. + !win32-*:contains(QT_CONFIG, opengl):contains(DEFINES, ENABLE_WEBGL=1) { DEFINES += WTF_USE_TEXTURE_MAPPER_GL=1 contains(QT_CONFIG, opengles2): LIBS += -lEGL } -- 2.7.4