Changeset 122175 in webkit


Ignore:
Timestamp:
Jul 9, 2012 6:06:52 PM (12 years ago)
Author:
noam.rosenthal@nokia.com
Message:

90506

Location:
trunk
Files:
2 deleted
48 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r122089 r122175  
     12012-07-09  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Shared code that is guarded with ENABLE(WEBGL) should be guarded with USE()
     4        https://bugs.webkit.org/show_bug.cgi?id=90506
     5
     6        Reviewed by Martin Robinson.
     7
     8        Made USE(3D_GRAPHICS) default to true when ENABLE(WEBGL) is true.
     9        Also updated the Qt default to always use TEXTURE_MAPPER, and to use TEXTURE_MAPPER_GL when
     10        3D_GRAPHICS is used.
     11
     12        * wtf/Platform.h:
     13
    1142012-07-08  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
    215

  • trunk/Source/WTF/wtf/Platform.h

    r122089 r122175  
    10151015#endif
    10161016
     1017
     1018/* Qt always uses Texture Mapper */
     1019#if PLATFORM(QT)
     1020#define WTF_USE_TEXTURE_MAPPER 1
     1021#if USE(3D_GRAPHICS)
     1022#define WTF_USE_TEXTURE_MAPPER_GL 1
     1023#endif
     1024#endif
     1025
     1026#if ENABLE(WEBGL) && !defined(WTF_USE_3D_GRAPHICS)
     1027#define WTF_USE_3D_GRAPHICS 1
     1028#endif
     1029
    10171030/* Compositing on the UI-process in WebKit2 */
    10181031#if PLATFORM(QT)

  • trunk/Source/WebCore/ChangeLog

    r122174 r122175  
     12012-07-09  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Shared code that is guarded with ENABLE(WEBGL) should be guarded with USE()
     4        https://bugs.webkit.org/show_bug.cgi?id=90506
     5
     6        Reviewed by Martin Robinson.
     7
     8        GraphicsContext3D, ANGLEWebKitBridge and Extensions3D are now guarded with USE(3D_GRAPHICS)
     9        instead of ENABLE(WEBGL).
     10
     11        No new tests, build changes only.
     12
     13        * Target.pri:
     14            Removed references to unused files.
     15
     16        * WebCore.pri:
     17            Updated the Qt build so that the basic 3D-graphics sources can be compiled even when
     18            WebGL is disabled.
     19
     20        * platform/graphics/ANGLEWebKitBridge.cpp:
     21        * platform/graphics/GraphicsContext3D.cpp:
     22        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
     23        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
     24        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
     25        * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
     26        * platform/graphics/qt/GraphicsContext3DQt.cpp:
     27        * platform/qt/QWebPageClient.h:
     28        * platform/graphics/OpenGLShims.cpp:
     29        * platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
     30        * platform/graphics/cairo/DrawingBufferCairo.cpp:
     31        * platform/graphics/cairo/GLContext.h:
     32        (GLContext):
     33        * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
     34        * platform/graphics/cairo/GraphicsContext3DPrivate.cpp:
     35        * platform/graphics/cg/GraphicsContext3DCG.cpp:
     36        * platform/graphics/clutter/DrawingBufferClutter.cpp:
     37        * platform/graphics/clutter/GraphicsContext3DClutter.cpp:
     38        * platform/graphics/clutter/GraphicsContext3DPrivate.cpp:
     39        * platform/graphics/efl/GraphicsContext3DEfl.cpp:
     40        * platform/graphics/efl/GraphicsContext3DPrivate.cpp:
     41        * platform/graphics/filters/CustomFilterCompiledProgram.cpp:
     42        * platform/graphics/filters/CustomFilterCompiledProgram.h:
     43        * platform/graphics/filters/CustomFilterGlobalContext.cpp:
     44        * platform/graphics/filters/CustomFilterGlobalContext.h:
     45        * platform/graphics/filters/CustomFilterMesh.cpp:
     46        * platform/graphics/filters/CustomFilterMesh.h:
     47        * platform/graphics/filters/CustomFilterProgram.cpp:
     48        (WebCore):
     49        * platform/graphics/filters/CustomFilterProgram.h:
     50        * platform/graphics/filters/FECustomFilter.cpp:
     51        * platform/graphics/filters/FECustomFilter.h:
     52        * platform/graphics/glx/GLContextGLX.cpp:
     53        (WebCore):
     54        * platform/graphics/glx/GLContextGLX.h:
     55        (GLContextGLX):
     56        * platform/graphics/gpu/DrawingBuffer.cpp:
     57        * platform/graphics/gpu/mac/DrawingBufferMac.mm:
     58        * platform/graphics/gpu/qt/DrawingBufferQt.cpp:
     59        * platform/graphics/mac/GraphicsContext3DMac.mm:
     60        * platform/graphics/qt/Extensions3DQt.cpp: Removed.
     61        * platform/graphics/qt/Extensions3DQt.h: Removed.
     62        * platform/graphics/skia/GraphicsContext3DSkia.cpp:
     63        * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
     64            Chaned ENABLE(WEBGL) to USE(3D_GRAPHICS)
     65
    1662012-07-09  Yongjun Zhang  <yongjun_zhang@apple.com>
    267

  • trunk/Source/WebCore/Target.pri

    r122159 r122175  
    39043904        html/canvas/WebGLUniformLocation.h \
    39053905        html/canvas/WebGLVertexArrayObjectOES.h \
    3906         platform/graphics/ANGLEWebKitBridge.h \
    3907         platform/graphics/Extensions3D.h \
    3908         platform/graphics/GraphicsContext3D.h \
    3909         platform/graphics/gpu/DrawingBuffer.h \
    3910         platform/graphics/qt/Extensions3DQt.h
    39113906
    39123907    v8 {
    … …  
    39463941        html/canvas/WebGLTexture.cpp \
    39473942        html/canvas/WebGLUniformLocation.cpp \
    3948         html/canvas/WebGLVertexArrayObjectOES.cpp \
     3943        html/canvas/WebGLVertexArrayObjectOES.cpp
     3944}
     3945
     3946contains(DEFINES, WTF_USE_3D_GRAPHICS=1) {
     3947    HEADERS += \
     3948        platform/graphics/ANGLEWebKitBridge.h \
     3949        platform/graphics/Extensions3D.h \
     3950        platform/graphics/GraphicsContext3D.h \
     3951        platform/graphics/gpu/DrawingBuffer.h \
     3952        platform/graphics/opengl/Extensions3DOpenGL.h \
     3953        platform/graphics/texmap/TextureMapperGL.h \
     3954        platform/graphics/texmap/TextureMapperShaderManager.h
     3955
     3956    SOURCES += \
    39493957        platform/graphics/ANGLEWebKitBridge.cpp \
    39503958        platform/graphics/GraphicsContext3D.cpp \
    39513959        platform/graphics/gpu/DrawingBuffer.cpp \
    39523960        platform/graphics/gpu/qt/DrawingBufferQt.cpp \
    3953         platform/graphics/qt/GraphicsContext3DQt.cpp
    3954 
    3955     INCLUDEPATH += $$PWD/platform/graphics/gpu
    3956 
    3957     contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
    3958         !contains(QT_CONFIG, opengles2) {
    3959             SOURCES += platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
    3960         } else {
    3961             SOURCES += platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
    3962         }
    3963 
    3964         HEADERS += platform/graphics/opengl/Extensions3DOpenGL.h
    3965 
    3966         SOURCES += \
    3967             platform/graphics/opengl/Extensions3DOpenGL.cpp \
    3968             platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
    3969 
    3970         ANGLE_DIR = $$replace(PWD, "WebCore", "ThirdParty/ANGLE")
    3971 
    3972         INCLUDEPATH += $$ANGLE_DIR/src $$ANGLE_DIR/include
    3973 
    3974         ANGLE_HEADERS += \
    3975             $$ANGLE_DIR/src/compiler/BaseTypes.h \
    3976             $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.h \
    3977             $$ANGLE_DIR/src/compiler/Common.h \
    3978             $$ANGLE_DIR/src/compiler/ConstantUnion.h \
    3979             $$ANGLE_DIR/src/compiler/debug.h \
    3980             $$ANGLE_DIR/src/compiler/DetectRecursion.h \
    3981             $$ANGLE_DIR/src/compiler/ExtensionBehavior.h \
    3982             $$ANGLE_DIR/src/compiler/ForLoopUnroll.h \
    3983             $$ANGLE_DIR/src/compiler/glslang.h \
    3984             $$ANGLE_DIR/src/compiler/glslang_tab.h \
    3985             $$ANGLE_DIR/src/compiler/InfoSink.h \
    3986             $$ANGLE_DIR/src/compiler/InitializeDll.h \
    3987             $$ANGLE_DIR/src/compiler/InitializeGlobals.h \
    3988             $$ANGLE_DIR/src/compiler/Initialize.h \
    3989             $$ANGLE_DIR/src/compiler/InitializeParseContext.h \
    3990             $$ANGLE_DIR/src/compiler/intermediate.h \
    3991             $$ANGLE_DIR/src/compiler/localintermediate.h \
    3992             $$ANGLE_DIR/src/compiler/MMap.h \
    3993             $$ANGLE_DIR/src/compiler/MapLongVariableNames.h \
    3994             $$ANGLE_DIR/src/compiler/osinclude.h \
    3995             $$ANGLE_DIR/src/compiler/preprocessor/atom.h \
    3996             $$ANGLE_DIR/src/compiler/preprocessor/compile.h \
    3997             $$ANGLE_DIR/src/compiler/preprocessor/cpp.h \
    3998             $$ANGLE_DIR/src/compiler/preprocessor/length_limits.h \
    3999             $$ANGLE_DIR/src/compiler/preprocessor/memory.h \
    4000             $$ANGLE_DIR/src/compiler/preprocessor/parser.h \
    4001             $$ANGLE_DIR/src/compiler/preprocessor/preprocess.h \
    4002             $$ANGLE_DIR/src/compiler/preprocessor/scanner.h \
    4003             $$ANGLE_DIR/src/compiler/preprocessor/slglobals.h \
    4004             $$ANGLE_DIR/src/compiler/preprocessor/symbols.h \
    4005             $$ANGLE_DIR/src/compiler/preprocessor/tokens.h \
    4006             $$ANGLE_DIR/src/compiler/OutputESSL.h \
    4007             $$ANGLE_DIR/src/compiler/OutputGLSL.h \
    4008             $$ANGLE_DIR/src/compiler/OutputGLSLBase.h \
    4009             $$ANGLE_DIR/src/compiler/OutputHLSL.h \
    4010             $$ANGLE_DIR/src/compiler/ParseHelper.h \
    4011             $$ANGLE_DIR/src/compiler/PoolAlloc.h \
    4012             $$ANGLE_DIR/src/compiler/QualifierAlive.h \
    4013             $$ANGLE_DIR/src/compiler/RemoveTree.h \
    4014             $$ANGLE_DIR/src/compiler/SearchSymbol.h \
    4015             $$ANGLE_DIR/src/compiler/ShHandle.h \
    4016             $$ANGLE_DIR/src/compiler/SymbolTable.h \
    4017             $$ANGLE_DIR/src/compiler/TranslatorESSL.h \
    4018             $$ANGLE_DIR/src/compiler/TranslatorGLSL.h \
    4019             $$ANGLE_DIR/src/compiler/TranslatorHLSL.h \
    4020             $$ANGLE_DIR/src/compiler/Types.h \
    4021             $$ANGLE_DIR/src/compiler/UnfoldSelect.h \
    4022             $$ANGLE_DIR/src/compiler/util.h \
    4023             $$ANGLE_DIR/src/compiler/ValidateLimitations.h \
    4024             $$ANGLE_DIR/src/compiler/VariableInfo.h \
    4025             $$ANGLE_DIR/src/compiler/VersionGLSL.h
    4026 
    4027         HEADERS += $$ANGLE_HEADERS
    4028 
    4029         ANGLE_SOURCES += \
    4030             $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.cpp \
    4031             $$ANGLE_DIR/src/compiler/CodeGenGLSL.cpp \
    4032             $$ANGLE_DIR/src/compiler/Compiler.cpp \
    4033             $$ANGLE_DIR/src/compiler/debug.cpp \
    4034             $$ANGLE_DIR/src/compiler/DetectRecursion.cpp \
    4035             $$ANGLE_DIR/src/compiler/ForLoopUnroll.cpp \
    4036             $$ANGLE_DIR/src/compiler/glslang_lex.cpp \
    4037             $$ANGLE_DIR/src/compiler/glslang_tab.cpp \
    4038             $$ANGLE_DIR/src/compiler/InfoSink.cpp \
    4039             $$ANGLE_DIR/src/compiler/Initialize.cpp \
    4040             $$ANGLE_DIR/src/compiler/InitializeDll.cpp \
    4041             $$ANGLE_DIR/src/compiler/Intermediate.cpp \
    4042             $$ANGLE_DIR/src/compiler/intermOut.cpp \
    4043             $$ANGLE_DIR/src/compiler/IntermTraverse.cpp \
    4044             $$ANGLE_DIR/src/compiler/MapLongVariableNames.cpp \
    4045             $$ANGLE_DIR/src/compiler/ossource_posix.cpp \
    4046             $$ANGLE_DIR/src/compiler/OutputESSL.cpp \
    4047             $$ANGLE_DIR/src/compiler/OutputGLSL.cpp \
    4048             $$ANGLE_DIR/src/compiler/OutputGLSLBase.cpp \
    4049             $$ANGLE_DIR/src/compiler/OutputHLSL.cpp \
    4050             $$ANGLE_DIR/src/compiler/parseConst.cpp \
    4051             $$ANGLE_DIR/src/compiler/ParseHelper.cpp \
    4052             $$ANGLE_DIR/src/compiler/PoolAlloc.cpp \
    4053             $$ANGLE_DIR/src/compiler/QualifierAlive.cpp \
    4054             $$ANGLE_DIR/src/compiler/RemoveTree.cpp \
    4055             $$ANGLE_DIR/src/compiler/SearchSymbol.cpp \
    4056             $$ANGLE_DIR/src/compiler/ShaderLang.cpp \
    4057             $$ANGLE_DIR/src/compiler/SymbolTable.cpp \
    4058             $$ANGLE_DIR/src/compiler/TranslatorESSL.cpp \
    4059             $$ANGLE_DIR/src/compiler/TranslatorGLSL.cpp \
    4060             $$ANGLE_DIR/src/compiler/TranslatorHLSL.cpp \
    4061             $$ANGLE_DIR/src/compiler/UnfoldSelect.cpp \
    4062             $$ANGLE_DIR/src/compiler/util.cpp \
    4063             $$ANGLE_DIR/src/compiler/ValidateLimitations.cpp \
    4064             $$ANGLE_DIR/src/compiler/VariableInfo.cpp \
    4065             $$ANGLE_DIR/src/compiler/VersionGLSL.cpp
    4066 
    4067         SOURCES += \
    4068             $$ANGLE_DIR/src/compiler/preprocessor/atom.c \
    4069             $$ANGLE_DIR/src/compiler/preprocessor/cpp.c \
    4070             $$ANGLE_DIR/src/compiler/preprocessor/cppstruct.c \
    4071             $$ANGLE_DIR/src/compiler/preprocessor/memory.c \
    4072             $$ANGLE_DIR/src/compiler/preprocessor/scanner.c \
    4073             $$ANGLE_DIR/src/compiler/preprocessor/symbols.c \
    4074             $$ANGLE_DIR/src/compiler/preprocessor/tokens.c
    4075 
    4076         *g++* {
    4077             ANGLE_CFLAGS += -Wno-unused-variable
    4078             ANGLE_CFLAGS += -Wno-missing-noreturn
    4079             ANGLE_CFLAGS += -Wno-unused-function
    4080             ANGLE_CFLAGS += -Wno-reorder
    4081             ANGLE_CFLAGS += -Wno-error
    4082 
    4083             angle_cxx.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$ANGLE_CFLAGS $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    4084             angle_cxx.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$$QMAKE_EXT_OBJ
    4085             anglc_cxx.dependency_type = TYPE_C
    4086             angle_cxx.depends = $$ANGLE_HEADERS
    4087             angle_cxx.input = ANGLE_SOURCES
    4088             QMAKE_EXTRA_COMPILERS += angle_cxx
    4089         } else {
    4090             SOURCES += $$ANGLE_SOURCES
    4091         }
     3961        platform/graphics/opengl/Extensions3DOpenGL.cpp \
     3962        platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp \
     3963        platform/graphics/qt/GraphicsContext3DQt.cpp \
     3964        platform/graphics/texmap/TextureMapperGL.cpp \
     3965        platform/graphics/texmap/TextureMapperShaderManager.cpp
     3966
     3967    contains(QT_CONFIG, opengles2) {
     3968        SOURCES += platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
     3969    } else {
     3970        SOURCES += platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
    40923971    }
    40933972
     3973    ANGLE_DIR = $$replace(PWD, "WebCore", "ThirdParty/ANGLE")
     3974
     3975    INCLUDEPATH += $$ANGLE_DIR/src $$ANGLE_DIR/include
     3976
     3977    ANGLE_HEADERS += \
     3978        $$ANGLE_DIR/src/compiler/BaseTypes.h \
     3979        $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.h \
     3980        $$ANGLE_DIR/src/compiler/Common.h \
     3981        $$ANGLE_DIR/src/compiler/ConstantUnion.h \
     3982        $$ANGLE_DIR/src/compiler/debug.h \
     3983        $$ANGLE_DIR/src/compiler/DetectRecursion.h \
     3984        $$ANGLE_DIR/src/compiler/ExtensionBehavior.h \
     3985        $$ANGLE_DIR/src/compiler/ForLoopUnroll.h \
     3986        $$ANGLE_DIR/src/compiler/glslang.h \
     3987        $$ANGLE_DIR/src/compiler/glslang_tab.h \
     3988        $$ANGLE_DIR/src/compiler/InfoSink.h \
     3989        $$ANGLE_DIR/src/compiler/InitializeDll.h \
     3990        $$ANGLE_DIR/src/compiler/InitializeGlobals.h \
     3991        $$ANGLE_DIR/src/compiler/Initialize.h \
     3992        $$ANGLE_DIR/src/compiler/InitializeParseContext.h \
     3993        $$ANGLE_DIR/src/compiler/intermediate.h \
     3994        $$ANGLE_DIR/src/compiler/localintermediate.h \
     3995        $$ANGLE_DIR/src/compiler/MMap.h \
     3996        $$ANGLE_DIR/src/compiler/MapLongVariableNames.h \
     3997        $$ANGLE_DIR/src/compiler/osinclude.h \
     3998        $$ANGLE_DIR/src/compiler/preprocessor/atom.h \
     3999        $$ANGLE_DIR/src/compiler/preprocessor/compile.h \
     4000        $$ANGLE_DIR/src/compiler/preprocessor/cpp.h \
     4001        $$ANGLE_DIR/src/compiler/preprocessor/length_limits.h \
     4002        $$ANGLE_DIR/src/compiler/preprocessor/memory.h \
     4003        $$ANGLE_DIR/src/compiler/preprocessor/parser.h \
     4004        $$ANGLE_DIR/src/compiler/preprocessor/preprocess.h \
     4005        $$ANGLE_DIR/src/compiler/preprocessor/scanner.h \
     4006        $$ANGLE_DIR/src/compiler/preprocessor/slglobals.h \
     4007        $$ANGLE_DIR/src/compiler/preprocessor/symbols.h \
     4008        $$ANGLE_DIR/src/compiler/preprocessor/tokens.h \
     4009        $$ANGLE_DIR/src/compiler/OutputESSL.h \
     4010        $$ANGLE_DIR/src/compiler/OutputGLSL.h \
     4011        $$ANGLE_DIR/src/compiler/OutputGLSLBase.h \
     4012        $$ANGLE_DIR/src/compiler/OutputHLSL.h \
     4013        $$ANGLE_DIR/src/compiler/ParseHelper.h \
     4014        $$ANGLE_DIR/src/compiler/PoolAlloc.h \
     4015        $$ANGLE_DIR/src/compiler/QualifierAlive.h \
     4016        $$ANGLE_DIR/src/compiler/RemoveTree.h \
     4017        $$ANGLE_DIR/src/compiler/SearchSymbol.h \
     4018        $$ANGLE_DIR/src/compiler/ShHandle.h \
     4019        $$ANGLE_DIR/src/compiler/SymbolTable.h \
     4020        $$ANGLE_DIR/src/compiler/TranslatorESSL.h \
     4021        $$ANGLE_DIR/src/compiler/TranslatorGLSL.h \
     4022        $$ANGLE_DIR/src/compiler/TranslatorHLSL.h \
     4023        $$ANGLE_DIR/src/compiler/Types.h \
     4024        $$ANGLE_DIR/src/compiler/UnfoldSelect.h \
     4025        $$ANGLE_DIR/src/compiler/util.h \
     4026        $$ANGLE_DIR/src/compiler/ValidateLimitations.h \
     4027        $$ANGLE_DIR/src/compiler/VariableInfo.h \
     4028        $$ANGLE_DIR/src/compiler/VersionGLSL.h
     4029
     4030    HEADERS += $$ANGLE_HEADERS
     4031
     4032    ANGLE_SOURCES += \
     4033        $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.cpp \
     4034        $$ANGLE_DIR/src/compiler/CodeGenGLSL.cpp \
     4035        $$ANGLE_DIR/src/compiler/Compiler.cpp \
     4036        $$ANGLE_DIR/src/compiler/debug.cpp \
     4037        $$ANGLE_DIR/src/compiler/DetectRecursion.cpp \
     4038        $$ANGLE_DIR/src/compiler/ForLoopUnroll.cpp \
     4039        $$ANGLE_DIR/src/compiler/glslang_lex.cpp \
     4040        $$ANGLE_DIR/src/compiler/glslang_tab.cpp \
     4041        $$ANGLE_DIR/src/compiler/InfoSink.cpp \
     4042        $$ANGLE_DIR/src/compiler/Initialize.cpp \
     4043        $$ANGLE_DIR/src/compiler/InitializeDll.cpp \
     4044        $$ANGLE_DIR/src/compiler/Intermediate.cpp \
     4045        $$ANGLE_DIR/src/compiler/intermOut.cpp \
     4046        $$ANGLE_DIR/src/compiler/IntermTraverse.cpp \
     4047        $$ANGLE_DIR/src/compiler/MapLongVariableNames.cpp \
     4048        $$ANGLE_DIR/src/compiler/ossource_posix.cpp \
     4049        $$ANGLE_DIR/src/compiler/OutputESSL.cpp \
     4050        $$ANGLE_DIR/src/compiler/OutputGLSL.cpp \
     4051        $$ANGLE_DIR/src/compiler/OutputGLSLBase.cpp \
     4052        $$ANGLE_DIR/src/compiler/OutputHLSL.cpp \
     4053        $$ANGLE_DIR/src/compiler/parseConst.cpp \
     4054        $$ANGLE_DIR/src/compiler/ParseHelper.cpp \
     4055        $$ANGLE_DIR/src/compiler/PoolAlloc.cpp \
     4056        $$ANGLE_DIR/src/compiler/QualifierAlive.cpp \
     4057        $$ANGLE_DIR/src/compiler/RemoveTree.cpp \
     4058        $$ANGLE_DIR/src/compiler/SearchSymbol.cpp \
     4059        $$ANGLE_DIR/src/compiler/ShaderLang.cpp \
     4060        $$ANGLE_DIR/src/compiler/SymbolTable.cpp \
     4061        $$ANGLE_DIR/src/compiler/TranslatorESSL.cpp \
     4062        $$ANGLE_DIR/src/compiler/TranslatorGLSL.cpp \
     4063        $$ANGLE_DIR/src/compiler/TranslatorHLSL.cpp \
     4064        $$ANGLE_DIR/src/compiler/UnfoldSelect.cpp \
     4065        $$ANGLE_DIR/src/compiler/util.cpp \
     4066        $$ANGLE_DIR/src/compiler/ValidateLimitations.cpp \
     4067        $$ANGLE_DIR/src/compiler/VariableInfo.cpp \
     4068        $$ANGLE_DIR/src/compiler/VersionGLSL.cpp
     4069
     4070    SOURCES += \
     4071        $$ANGLE_DIR/src/compiler/preprocessor/atom.c \
     4072        $$ANGLE_DIR/src/compiler/preprocessor/cpp.c \
     4073        $$ANGLE_DIR/src/compiler/preprocessor/cppstruct.c \
     4074        $$ANGLE_DIR/src/compiler/preprocessor/memory.c \
     4075        $$ANGLE_DIR/src/compiler/preprocessor/scanner.c \
     4076        $$ANGLE_DIR/src/compiler/preprocessor/symbols.c \
     4077        $$ANGLE_DIR/src/compiler/preprocessor/tokens.c
     4078
     4079    *g++* {
     4080        ANGLE_CFLAGS += -Wno-unused-variable
     4081        ANGLE_CFLAGS += -Wno-missing-noreturn
     4082        ANGLE_CFLAGS += -Wno-unused-function
     4083        ANGLE_CFLAGS += -Wno-reorder
     4084        ANGLE_CFLAGS += -Wno-error
     4085
     4086        angle_cxx.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$ANGLE_CFLAGS $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     4087        angle_cxx.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$$QMAKE_EXT_OBJ
     4088        anglc_cxx.dependency_type = TYPE_C
     4089        angle_cxx.depends = $$ANGLE_HEADERS
     4090        angle_cxx.input = ANGLE_SOURCES
     4091        QMAKE_EXTRA_COMPILERS += angle_cxx
     4092    } else {
     4093        SOURCES += $$ANGLE_SOURCES
     4094    }
     4095
    40944096    CONFIG += opengl-shims
    4095 }
     4097    INCLUDEPATH += platform/graphics/gpu
     4098}
     4099
    40964100
    40974101contains(DEFINES, ENABLE_MHTML=1) {
    … …  
    41494153}
    41504154
    4151 contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1) {
    4152     HEADERS += \
    4153         platform/graphics/texmap/TextureMapperGL.h \
    4154         platform/graphics/texmap/TextureMapperShaderManager.h
    4155 
    4156     SOURCES += \
    4157         platform/graphics/texmap/TextureMapperGL.cpp \
    4158         platform/graphics/texmap/TextureMapperShaderManager.cpp
    4159 
    4160     CONFIG += opengl-shims
    4161 }
    4162 
    41634155contains(CONFIG, opengl-shims) {
    41644156    HEADERS += platform/graphics/OpenGLShims.h

  • trunk/Source/WebCore/WebCore.pri

    r121958 r122175  
    77
    88SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
    9 
    10 # We enable TextureMapper by default; remove this line to enable GraphicsLayerQt.
    11 CONFIG += texmap
    129
    1310QT *= network sql
    … …  
    204201}
    205202
    206 contains(DEFINES, ENABLE_WEBGL=1) {
    207     !contains(QT_CONFIG, opengl) {
    208         error( "This configuration needs an OpenGL enabled Qt. Your Qt is missing OpenGL.")
    209     }
    210 }
    211 
    212 contains(CONFIG, texmap) {
    213     DEFINES += WTF_USE_TEXTURE_MAPPER=1
    214     # TextureMapperGL requires stuff from GraphicsContext3D, hence the WebGL
    215     # dependency.
    216     !win32-*:contains(QT_CONFIG, opengl):contains(DEFINES, ENABLE_WEBGL=1) {
    217         DEFINES += WTF_USE_TEXTURE_MAPPER_GL=1
    218         contains(QT_CONFIG, opengles2): LIBS += -lEGL
    219     }
     203contains(DEFINES, WTF_USE_3D_GRAPHICS=1) {
     204    contains(QT_CONFIG, opengles2): LIBS += -lEGL
    220205    mac: LIBS += -framework IOSurface -framework CoreFoundation
    221 }
    222 
    223 contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1)|contains(DEFINES, ENABLE_WEBGL=1) {
    224     # Only Qt 4 needs the opengl module, for Qt 5 everything we need is part of QtGui.
    225     haveQt(4): QT *= opengl
     206    # Only WebKit1 needs the opengl module, so it's optional for Qt5.
     207    haveQt(4)|contains(QT_CONFIG, opengl): QT *= opengl
    226208}
    227209

  • trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp

    r121259 r122175  
    2626#include "config.h"
    2727
    28 #if ENABLE(WEBGL)
     28#if USE(3D_GRAPHICS)
    2929
    3030#include "ANGLEWebKitBridge.h"
    … …  
    118118}
    119119
    120 #endif // ENABLE(WEBGL)
     120#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp

    r120668 r122175  
    2727#include "config.h"
    2828
    29 #if ENABLE(WEBGL)
     29#if USE(3D_GRAPHICS)
    3030
    3131#include "GraphicsContext3D.h"
    … …  
    18341834} // namespace WebCore
    18351835
    1836 #endif // ENABLE(WEBGL)
     1836#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp

    r119098 r122175  
    1818
    1919#include "config.h"
    20 #if ENABLE(WEBGL) || defined(QT_OPENGL_SHIMS)
     20#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS)
    2121
    2222#define DISABLE_SHIMS
    … …  
    228228} // namespace WebCore
    229229
    230 #endif // ENABLE(WEBGL)
     230#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp

    r113486 r122175  
    2727#include "config.h"
    2828
    29 #if ENABLE(WEBGL)
     29#if USE(3D_GRAPHICS)
    3030
    3131#include "GraphicsContext3D.h"
    … …  
    210210} // namespace WebCore
    211211
    212 #endif // ENABLE(WEBGL)
    213 
     212#endif // USE(3D_GRAPHICS)
     213

  • trunk/Source/WebCore/platform/graphics/cairo/DrawingBufferCairo.cpp

    r117379 r122175  
    2626#include "config.h"
    2727
    28 #if ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGL)
     28#if ENABLE(ACCELERATED_2D_CANVAS) || USE(3D_GRAPHICS)
    2929
    3030#include "DrawingBuffer.h"

  • trunk/Source/WebCore/platform/graphics/cairo/GLContext.h

    r120262 r122175  
    4343    virtual IntSize defaultFrameBufferSize() = 0;
    4444
    45 #if ENABLE(WEBGL)
     45#if USE(3D_GRAPHICS)
    4646    virtual PlatformGraphicsContext3D platformContext() = 0;
    4747#endif

  • trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

    r122156 r122175  
    2929#include "GraphicsContext3D.h"
    3030
    31 #if ENABLE(WEBGL)
     31#if USE(3D_GRAPHICS)
    3232
    3333#include "Extensions3DOpenGL.h"
    … …  
    259259} // namespace WebCore
    260260
    261 #endif // ENABLE(WEBGL)
     261#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp

    r120359 r122175  
    2121#include "GraphicsContext3DPrivate.h"
    2222
    23 #if ENABLE(WEBGL)
     23#if USE(3D_GRAPHICS)
    2424
    2525#include "HostWindow.h"
    … …  
    130130} // namespace WebCore
    131131
    132 #endif // ENABLE_WEBGL
     132#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp

    r117191 r122175  
    2727#include "config.h"
    2828
    29 #if ENABLE(WEBGL)
     29#if USE(3D_GRAPHICS)
    3030
    3131#include "GraphicsContext3D.h"
    … …  
    284284} // namespace WebCore
    285285
    286 #endif // ENABLE(WEBGL)
     286#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/clutter/DrawingBufferClutter.cpp

    r117379 r122175  
    3232#include "config.h"
    3333
    34 #if ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGL)
     34#if ENABLE(ACCELERATED_2D_CANVAS) || USE(3D_GRAPHICS)
    3535
    3636#include "DrawingBuffer.h"

  • trunk/Source/WebCore/platform/graphics/clutter/GraphicsContext3DClutter.cpp

    r122156 r122175  
    3030#include "GraphicsContext3D.h"
    3131
    32 #if ENABLE(WEBGL)
     32#if USE(3D_GRAPHICS)
    3333
    3434#include "Extensions3DOpenGL.h"
    … …  
    101101} // namespace WebCore
    102102
    103 #endif // ENABLE(WEBGL)
     103#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/clutter/GraphicsContext3DPrivate.cpp

    r112141 r122175  
    2121#include "GraphicsContext3DPrivate.h"
    2222
    23 #if ENABLE(WEBGL)
     23#if USE(3D_GRAPHICS)
    2424
    2525#include "HostWindow.h"
    … …  
    6262} // namespace WebCore
    6363
    64 #endif // ENABLE_WEBGL
     64#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp

    r117379 r122175  
    2020#include "config.h"
    2121
    22 #if ENABLE(WEBGL) || USE(ACCELERATED_COMPOSITING)
     22#if USE(3D_GRAPHICS) || USE(ACCELERATED_COMPOSITING)
    2323
    2424#include "GraphicsContext3DPrivate.h"
    … …  
    858858} // namespace WebCore
    859859
    860 #endif // ENABLE(WEBGL)
     860#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp

    r111673 r122175  
    2020#include "config.h"
    2121
    22 #if ENABLE(WEBGL) || USE(ACCELERATED_COMPOSITING)
     22#if USE(3D_GRAPHICS) || USE(ACCELERATED_COMPOSITING)
    2323
    2424#include "GraphicsContext3DPrivate.h"
    … …  
    11221122} // namespace WebCore
    11231123
    1124 #endif // ENABLE(WEBGL) || USE(ACCELERATED_COMPOSITING)
     1124#endif // USE(3D_GRAPHICS) || USE(ACCELERATED_COMPOSITING)

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterCompiledProgram.cpp

    r120893 r122175  
    3030#include "config.h"
    3131
    32 #if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     32#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    3333#include "CustomFilterCompiledProgram.h"
    3434 
    … …  
    177177
    178178} // namespace WebCore
    179 #endif // ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     179#endif // ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterCompiledProgram.h

    r120893 r122175  
    3131#define CustomFilterCompiledProgram_h
    3232
    33 #if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     33#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    3434
    3535#include "GraphicsTypes3D.h"
    … …  
    105105}
    106106
    107 #endif // ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     107#endif // ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    108108
    109109#endif

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterGlobalContext.cpp

    r120757 r122175  
    3030#include "config.h"
    3131
    32 #if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     32#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    3333#include "CustomFilterGlobalContext.h"
    3434
    … …  
    6060} // namespace WebCore
    6161
    62 #endif // ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     62#endif // ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterGlobalContext.h

    r120757 r122175  
    3131#define CustomFilterGlobalContext_h
    3232
    33 #if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     33#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    3434#include <wtf/RefPtr.h>
    3535
    … …  
    5454} // namespace WebCore
    5555
    56 #endif // ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     56#endif // ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    5757
    5858#endif // CustomFilterGlobalContext_h

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterMesh.cpp

    r108952 r122175  
    3030#include "config.h"
    3131
    32 #if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     32#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    3333#include "CustomFilterMesh.h"
    3434#include "GraphicsContext3D.h"
    … …  
    263263} // namespace WebCore
    264264
    265 #endif // ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
    266 
     265#endif // ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
     266

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterMesh.h

    r108952 r122175  
    3131#define CustomFilterMesh_h
    3232
    33 #if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     33#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    3434
    3535#include "CustomFilterOperation.h"
    … …  
    7676} // namespace WebCore
    7777
    78 #endif // ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     78#endif // ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    7979
    8080#endif // CustomFilterMesh_h

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterProgram.cpp

    r120893 r122175  
    3636#include "CustomFilterProgramClient.h"
    3737
    38 #if ENABLE(WEBGL)
     38#if USE(3D_GRAPHICS)
    3939#include "GraphicsContext3D.h"
    4040#endif
    … …  
    8181}
    8282
    83 #if ENABLE(WEBGL)
     83#if USE(3D_GRAPHICS)
    8484PassRefPtr<CustomFilterCompiledProgram> CustomFilterProgram::compileProgramWithContext(GraphicsContext3D* context)
    8585{

  • trunk/Source/WebCore/platform/graphics/filters/CustomFilterProgram.h

    r120893 r122175  
    5454    void removeClient(CustomFilterProgramClient*);
    5555   
    56 #if ENABLE(WEBGL)
     56#if USE(3D_GRAPHICS)
    5757    PassRefPtr<CustomFilterCompiledProgram> compileProgramWithContext(GraphicsContext3D*);
    5858#endif

  • trunk/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp

    r120935 r122175  
    3030#include "config.h"
    3131
    32 #if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     32#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    3333#include "FECustomFilter.h"
    3434
    … …  
    304304} // namespace WebCore
    305305
    306 #endif // ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     306#endif // ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/filters/FECustomFilter.h

    r120935 r122175  
    3131#define FECustomFilter_h
    3232
    33 #if ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     33#if ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    3434
    3535#include "CustomFilterOperation.h"
    … …  
    104104} // namespace WebCore
    105105
    106 #endif // ENABLE(CSS_SHADERS) && ENABLE(WEBGL)
     106#endif // ENABLE(CSS_SHADERS) && USE(3D_GRAPHICS)
    107107
    108108#endif // FECustomFilter_h

  • trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp

    r120673 r122175  
    312312}
    313313
    314 #if ENABLE(WEBGL)
     314#if USE(3D_GRAPHICS)
    315315PlatformGraphicsContext3D GLContextGLX::platformContext()
    316316{
    … …  
    321321} // namespace WebCore
    322322
    323 #endif // ENABLE(WEBGL) || && USE(TEXTURE_MAPPER_GL)
     323#endif // USE(GLX)

  • trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.h

    r120262 r122175  
    4949    virtual IntSize defaultFrameBufferSize();
    5050
    51 #if ENABLE(WEBGL)
     51#if USE(3D_GRAPHICS)
    5252    virtual PlatformGraphicsContext3D platformContext();
    5353#endif

  • trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp

    r114961 r122175  
    3131#include "config.h"
    3232
    33 #if ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGL)
     33#if ENABLE(ACCELERATED_2D_CANVAS) || USE(3D_GRAPHICS)
    3434
    3535#include "DrawingBuffer.h"

  • trunk/Source/WebCore/platform/graphics/gpu/mac/DrawingBufferMac.mm

    r114961 r122175  
    2626#include "config.h"
    2727
    28 #if ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGL)
     28#if ENABLE(ACCELERATED_2D_CANVAS) || USE(3D_GRAPHICS)
    2929
    3030#include "DrawingBuffer.h"

  • trunk/Source/WebCore/platform/graphics/gpu/qt/DrawingBufferQt.cpp

    r117379 r122175  
    2626#include "config.h"
    2727
    28 #if ENABLE(ACCELERATED_2D_CANVAS) || ENABLE(WEBGL)
     28#if USE(3D_GRAPHICS)
    2929
    3030#include "DrawingBuffer.h"

  • trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm

    r122156 r122175  
    2626#include "config.h"
    2727
    28 #if ENABLE(WEBGL)
     28#if USE(3D_GRAPHICS)
    2929
    3030#include "GraphicsContext3D.h"
    … …  
    285285}
    286286
    287 #endif // ENABLE(WEBGL)
     287#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

    r122156 r122175  
    2626#include "config.h"
    2727
    28 #if ENABLE(WEBGL)
     28#if USE(3D_GRAPHICS)
    2929
    3030#include "Extensions3DOpenGL.h"
    … …  
    210210} // namespace WebCore
    211211
    212 #endif // ENABLE(WEBGL)
     212#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

    r122156 r122175  
    2626#include "config.h"
    2727
    28 #if ENABLE(WEBGL)
     28#if USE(3D_GRAPHICS)
    2929
    3030#include "GraphicsContext3D.h"
    … …  
    259259}
    260260
    261 #endif // ENABLE(WEBGL)
     261#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

    r122156 r122175  
    2727#include "config.h"
    2828
    29 #if ENABLE(WEBGL)
     29#if USE(3D_GRAPHICS)
    3030
    3131#include "GraphicsContext3D.h"
    … …  
    13961396}
    13971397
    1398 #endif // ENABLE(WEBGL)
     1398#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp

    r122156 r122175  
    2727#include "config.h"
    2828
    29 #if ENABLE(WEBGL)
     29#if USE(3D_GRAPHICS)
    3030
    3131#include "GraphicsContext3D.h"
    … …  
    171171} // namespace WebCore
    172172
    173 #endif // ENABLE(WEBGL)
     173#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

    r122156 r122175  
    1818
    1919#include "config.h"
    20 
    2120#include "GraphicsContext3D.h"
    2221
    23 #include "WebGLObject.h"
    24 #include "CanvasRenderingContext.h"
    2522#include "Extensions3DOpenGL.h"
    2623#include "GraphicsContext.h"
    2724#include "GraphicsSurface.h"
    28 #include "HTMLCanvasElement.h"
    2925#include "HostWindow.h"
    3026#include "ImageBuffer.h"
    … …  
    4137#include <wtf/text/CString.h>
    4238
    43 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
     39#if USE(TEXTURE_MAPPER_GL)
    4440#include <texmap/TextureMapperGL.h>
    4541#endif
    4642
    47 #if ENABLE(WEBGL)
     43#if USE(3D_GRAPHICS)
    4844
    4945namespace WebCore {
    … …  
    543539}
    544540
    545 #endif // ENABLE(WEBGL)
     541#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp

    r117191 r122175  
    2727#include "config.h"
    2828
    29 #if ENABLE(WEBGL)
     29#if USE(3D_GRAPHICS)
    3030
    3131#include "GraphicsContext3D.h"
    … …  
    9393} // namespace WebCore
    9494
    95 #endif // ENABLE(WEBGL)
     95#endif // USE(3D_GRAPHICS)

  • trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h

    r120532 r122175  
    2626#include "Image.h"
    2727#include "TextureMapperLayer.h"
    28 
    29 #if ENABLE(WEBGL)
    30 #include "GraphicsContext3D.h"
    31 #endif
    3228
    3329namespace WebCore {

  • trunk/Source/WebCore/platform/qt/QWebPageClient.h

    r119098 r122175  
    3535#endif
    3636
    37 #if ENABLE(WEBGL)
     37#if USE(3D_GRAPHICS)
    3838#include <GraphicsContext3D.h>
    3939#endif
    … …  
    107107    virtual void setWidgetVisible(WebCore::Widget*, bool visible) = 0;
    108108
    109 #if ENABLE(WEBGL)
     109#if USE(3D_GRAPHICS)
    110110    virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
    111111                                                 PlatformGraphicsSurface3D*) = 0;

  • trunk/Source/WebKit/qt/ChangeLog

    r121967 r122175  
     12012-07-09  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Shared code that is guarded with ENABLE(WEBGL) should be guarded with USE()
     4        https://bugs.webkit.org/show_bug.cgi?id=90506
     5
     6        Reviewed by Martin Robinson.
     7
     8        Updated necessary parts of PageClientQt to be guarded with USE(3D_GRAPHICS) instead of
     9        ENABLE(WEBGL). The WebKit1 glue to WebGL still requires the Qt OpenGL module, so it's
     10        disable if QT_OPENGL_LIB is not defined.
     11
     12        * WebCoreSupport/PageClientQt.cpp:
     13        (createPlatformGraphicsContext3DFromWidget):
     14        (WebCore):
     15        * WebCoreSupport/PageClientQt.h:
     16        (PageClientQWidget):
     17        (PageClientQGraphicsWidget):
     18
    1192012-07-06  Csaba Osztrogonác  <ossy@webkit.org>
    220

  • trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp

    r121710 r122175  
    2424#include <QGraphicsScene>
    2525#include <QGraphicsView>
     26
    2627#if defined(Q_WS_X11)
    2728#include <QX11Info>
    2829#endif
    2930
    30 #if ENABLE(WEBGL)
     31#ifdef QT_OPENGL_LIB
    3132#include <QGLWidget>
    32 
     33#endif
     34
     35#if USE(3D_GRAPHICS)
    3336#if HAVE(QT5)
    3437#include <QWindow>
    … …  
    3841                                                      PlatformGraphicsSurface3D* surface)
    3942{
     43#ifdef QT_OPENGL_LIB
    4044    *context = 0;
    4145    *surface = 0;
    … …  
    6266        glWidget = 0;
    6367    }
     68#endif
    6469}
    6570#endif
    … …  
    238243}
    239244
    240 #if ENABLE(WEBGL)
     245#if USE(3D_GRAPHICS)
    241246void PageClientQWidget::createPlatformGraphicsContext3D(PlatformGraphicsContext3D* context,
    242247                                                        PlatformGraphicsSurface3D* surface)
    … …  
    427432#endif // QT_NO_GRAPHICSVIEW
    428433
    429 #if ENABLE(WEBGL)
     434#if USE(3D_GRAPHICS)
    430435void PageClientQGraphicsWidget::createPlatformGraphicsContext3D(PlatformGraphicsContext3D* context,
    431436                                                                PlatformGraphicsSurface3D* surface)

  • trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h

    r121710 r122175  
    100100    virtual void setWidgetVisible(Widget*, bool visible);
    101101
    102 #if ENABLE(WEBGL)
     102#if USE(3D_GRAPHICS)
    103103    virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
    104104                                                 PlatformGraphicsSurface3D*);
    … …  
    208208    virtual void setWidgetVisible(Widget*, bool);
    209209
    210 #if ENABLE(WEBGL)
     210#if USE(3D_GRAPHICS)
    211211    virtual void createPlatformGraphicsContext3D(PlatformGraphicsContext3D*,
    212212                                                 PlatformGraphicsSurface3D*);

  • trunk/Tools/ChangeLog

    r122174 r122175  
     12012-07-09  No'am Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Shared code that is guarded with ENABLE(WEBGL) should be guarded with USE()
     4        https://bugs.webkit.org/show_bug.cgi?id=90506
     5
     6        Reviewed by Martin Robinson.
     7
     8        Always enable the WTF_USE_3D_GRAPHICS flag in features.prf if we're compiling with Qt5
     9        or if the OpenGL module is enabled.
     10
     11        * qmake/mkspecs/features/features.prf:
     12
    1132012-07-09  Yongjun Zhang  <yongjun_zhang@apple.com>
    214

  • trunk/Tools/qmake/mkspecs/features/features.prf

    r121963 r122175  
    213213    contains(DEFINES, $$opposite): DEFINES -= $$define
    214214}
     215
     216# Enable the USE(3D_GRAPHICS) flag for Qt5 or when QtOpenGL is enabled.
     217!contains(DEFINES, WTF_USE_3D_GRAPHICS=.) {
     218    haveQt(5)|contains(QT_CONFIG, opengl): DEFINES += WTF_USE_3D_GRAPHICS=1
     219}
     220
     221haveQt(4):contains(DEFINES, ENABLE_WEBGL=1):contains(DEFINES, WTF_USE_3D_GRAPHICS=0) {
     222    error("WebGL requires Qt to be configured with OpenGL. Please reconfigure Qt with OpenGL, or build WebKit without WebGL.")
     223}
Note: See TracChangeset for help on using the changeset viewer.