[webkit-reviews] review denied: [Bug 64878] [Qt] Adopt GraphicsContext3DOpenGL.cpp and ANGLE (part 2) : [Attachment 101652] simplified ANGLE build
bugzilla-daemon at webkit.org
bugzilla-daemon at webkit.org
Sun Jul 24 09:20:04 PDT 2011
Noam Rosenthal <noam.rosenthal at nokia.com> has denied Andrew Wason
<rectalogic at rectalogic.com>'s request for review:
Bug 64878: [Qt] Adopt GraphicsContext3DOpenGL.cpp and ANGLE (part 2)
https://bugs.webkit.org/show_bug.cgi?id=64878
Attachment 101652: simplified ANGLE build
https://bugs.webkit.org/attachment.cgi?id=101652&action=review
------- Additional Comments from Noam Rosenthal <noam.rosenthal at nokia.com>
View in context: https://bugs.webkit.org/attachment.cgi?id=101652&action=review
> Source/WebCore/WebCore.pro:3637
> + *g++* {
> + QMAKE_CXXFLAGS += -Wno-unused-variable
> + QMAKE_CXXFLAGS += -Wno-missing-noreturn
> + QMAKE_CXXFLAGS += -Wno-unused-function
> + QMAKE_CXXFLAGS += -Wno-reorder
> + }
Sorry, I can't let an overarching disabling of warnings in...
We have to figure out a way to diable these for ANGLE files only, or to live
with those warnings being outputted when we build the ANGLE files.
> Source/WebCore/WebCore.pro:3736
> + HEADERS += \
> + $$ANGLE_DIR/src/compiler/BaseTypes.h \
> + $$ANGLE_DIR/src/compiler/Common.h \
> + $$ANGLE_DIR/src/compiler/ConstantUnion.h \
> + $$ANGLE_DIR/src/compiler/debug.h \
> + $$ANGLE_DIR/src/compiler/ExtensionBehavior.h \
> + $$ANGLE_DIR/src/compiler/ForLoopUnroll.h \
> + $$ANGLE_DIR/src/compiler/glslang.h \
> + $$ANGLE_DIR/src/compiler/glslang_tab.h \
> + $$ANGLE_DIR/src/compiler/InfoSink.h \
> + $$ANGLE_DIR/src/compiler/InitializeDll.h \
> + $$ANGLE_DIR/src/compiler/InitializeGlobals.h \
> + $$ANGLE_DIR/src/compiler/Initialize.h \
> + $$ANGLE_DIR/src/compiler/InitializeParseContext.h \
> + $$ANGLE_DIR/src/compiler/intermediate.h \
> + $$ANGLE_DIR/src/compiler/localintermediate.h \
> + $$ANGLE_DIR/src/compiler/MMap.h \
> + $$ANGLE_DIR/src/compiler/MapLongVariableNames.h \
> + $$ANGLE_DIR/src/compiler/osinclude.h \
> + $$ANGLE_DIR/src/compiler/OutputESSL.h \
> + $$ANGLE_DIR/src/compiler/OutputGLSL.h \
> + $$ANGLE_DIR/src/compiler/OutputGLSLBase.h \
> + $$ANGLE_DIR/src/compiler/OutputHLSL.h \
> + $$ANGLE_DIR/src/compiler/ParseHelper.h \
> + $$ANGLE_DIR/src/compiler/PoolAlloc.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/atom.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/compile.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/cpp.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/memory.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/parser.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/preprocess.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/scanner.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/slglobals.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/symbols.h \
> + $$ANGLE_DIR/src/compiler/preprocessor/tokens.h \
> + $$ANGLE_DIR/src/compiler/QualifierAlive.h \
> + $$ANGLE_DIR/src/compiler/RemoveTree.h \
> + $$ANGLE_DIR/src/compiler/SearchSymbol.h \
> + $$ANGLE_DIR/src/compiler/ShHandle.h \
> + $$ANGLE_DIR/src/compiler/SymbolTable.h \
> + $$ANGLE_DIR/src/compiler/TranslatorESSL.h \
> + $$ANGLE_DIR/src/compiler/TranslatorGLSL.h \
> + $$ANGLE_DIR/src/compiler/TranslatorHLSL.h \
> + $$ANGLE_DIR/src/compiler/Types.h \
> + $$ANGLE_DIR/src/compiler/UnfoldSelect.h \
> + $$ANGLE_DIR/src/compiler/util.h \
> + $$ANGLE_DIR/src/compiler/ValidateLimitations.h \
> + $$ANGLE_DIR/src/compiler/VariableInfo.h \
> + $$ANGLE_DIR/src/compiler/VersionGLSL.h \
> +
> + SOURCES += \
> + $$ANGLE_DIR/src/compiler/CodeGenGLSL.cpp \
> + $$ANGLE_DIR/src/compiler/CodeGenHLSL.cpp \
> + $$ANGLE_DIR/src/compiler/Compiler.cpp \
> + $$ANGLE_DIR/src/compiler/debug.cpp \
> + $$ANGLE_DIR/src/compiler/glslang_lex.cpp \
> + $$ANGLE_DIR/src/compiler/glslang_tab.cpp \
> + $$ANGLE_DIR/src/compiler/ForLoopUnroll.cpp \
> + $$ANGLE_DIR/src/compiler/InfoSink.cpp \
> + $$ANGLE_DIR/src/compiler/Initialize.cpp \
> + $$ANGLE_DIR/src/compiler/InitializeDll.cpp \
> + $$ANGLE_DIR/src/compiler/Intermediate.cpp \
> + $$ANGLE_DIR/src/compiler/intermOut.cpp \
> + $$ANGLE_DIR/src/compiler/IntermTraverse.cpp \
> + $$ANGLE_DIR/src/compiler/ossource_posix.cpp \
> + $$ANGLE_DIR/src/compiler/MapLongVariableNames.cpp \
> + $$ANGLE_DIR/src/compiler/OutputESSL.cpp \
> + $$ANGLE_DIR/src/compiler/OutputGLSL.cpp \
> + $$ANGLE_DIR/src/compiler/OutputGLSLBase.cpp \
> + $$ANGLE_DIR/src/compiler/OutputHLSL.cpp \
> + $$ANGLE_DIR/src/compiler/parseConst.cpp \
> + $$ANGLE_DIR/src/compiler/ParseHelper.cpp \
> + $$ANGLE_DIR/src/compiler/PoolAlloc.cpp \
> + $$ANGLE_DIR/src/compiler/preprocessor/atom.c \
> + $$ANGLE_DIR/src/compiler/preprocessor/cpp.c \
> + $$ANGLE_DIR/src/compiler/preprocessor/cppstruct.c \
> + $$ANGLE_DIR/src/compiler/preprocessor/memory.c \
> + $$ANGLE_DIR/src/compiler/preprocessor/scanner.c \
> + $$ANGLE_DIR/src/compiler/preprocessor/symbols.c \
> + $$ANGLE_DIR/src/compiler/preprocessor/tokens.c \
> + $$ANGLE_DIR/src/compiler/QualifierAlive.cpp \
> + $$ANGLE_DIR/src/compiler/RemoveTree.cpp \
> + $$ANGLE_DIR/src/compiler/SearchSymbol.cpp \
> + $$ANGLE_DIR/src/compiler/ShaderLang.cpp \
> + $$ANGLE_DIR/src/compiler/SymbolTable.cpp \
> + $$ANGLE_DIR/src/compiler/TranslatorESSL.cpp \
> + $$ANGLE_DIR/src/compiler/TranslatorGLSL.cpp \
> + $$ANGLE_DIR/src/compiler/TranslatorHLSL.cpp \
> + $$ANGLE_DIR/src/compiler/UnfoldSelect.cpp \
> + $$ANGLE_DIR/src/compiler/util.cpp \
> + $$ANGLE_DIR/src/compiler/ValidateLimitations.cpp \
> + $$ANGLE_DIR/src/compiler/VariableInfo.cpp \
> + $$ANGLE_DIR/src/compiler/VersionGLSL.cpp \
> +
All this should be under !CONTAINS(QT_CONFIG, opengles2)
> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:32
> +#if ENABLE(WEBGL) && !defined(QT_OPENGL_ES_2)
See previous comment. We can put this in the .pro file under
contains(QT_CONFIG, opengles2)
> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:344
> + ::glActiveTexture(GL_TEXTURE0);
Please ask Martin Robinson to review this.
More information about the webkit-reviews
mailing list