Skip to content
Permalink
Browse files
[ANGLE] Update ANGLE in WebKit
https://bugs.webkit.org/show_bug.cgi?id=106274

Reviewed by Dean Jackson.

Update ANGLE to r1641.

Source/ThirdParty/ANGLE:

ANGLE parsers were generated with Bison 2.3.

Additionally, perform the following changes to WebKit's ANGLE build system. Note that these
changes only apply to WebKit's copy of ANGLE, and do not need to be upstreamed to ANGLE.
(a) Remove all files in the libEGL and libGLESv2 directories because nobody is using them.
    Add a README in each directory to explain why their contents are not copied over from
    ANGLE. This simplifies updating ANGLE in the future.
(b) Remove the build_angle.xcodeproj file that no-one is using. It appears it was copied
    over from a gyp build of ANGLE. The Mac build uses ANGLE.xcodeproj.
(c) Remove duplicate file entries in ANGLE.xcodeproj. Change its Xcode group structure to
    match ANGLE's directory structure.
(d) Add a Copy Files task to ANGLE.xcodeproj to put the khrplatform.h header in the right
    place so ShaderLang.h can find it. ShaderLang.h is copied to
    <BuildDir>/usr/local/include/ANGLE/ShaderLang.h during the Copy Headers task, and it
    includes "KHR/khrplatform.h". Thus, we need to copy khrplatform.h to
    <BuildDir>/usr/local/include/ANGLE/KHR/khrplatform.h.

Additionally, make one build fix in ANGLE source that should be upstreamed to ANGLE:
(1) Before this patch in ExpressionParser.y, we toggled the "-Wpragmas" flag so compilers
    could ignore the pragmas that they didn't understand instead of generating an error.
    However, clang does not understand "-Wpragmas" itself. Instead, tt understands
    "-Wunknown-pragmas". Now, instead of trying to temporarily ignore pragmas, we apply the
    right flags to the right compiler versions. The new code in ExpressionParser.y looks
    like:

"""
// Turn off uninitialized variable warnings triggered by the auto-generated pplval variable.
// On gcc 4.7+, The flag is called "-Wmaybe-uninitialized".
// On clang and gcc < 4.7, the flag is called "-Wuninitialized".
#if !defined(__clang__) && ((__GNUC__ == 4 && __GNU_C_MINOR__ >= 7) || __GNUC__ >= 5)
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#else
#pragma GCC diagnostic ignored "-Wuninitialized"
#endif
"""

* ANGLE.plist:
* ANGLE.pri:
* ANGLE.xcodeproj/project.pbxproj:
* DerivedSources.pri:
* Target.pri:
* include/GLSLANG/ShaderLang.h:
* src/build_angle.xcodeproj/project.pbxproj: Removed.
* src/common/angleutils.h:
* src/common/debug.cpp:
(gl::ScopedPerfEventHelper::ScopedPerfEventHelper):
* src/common/debug.h:
* src/common/version.h:
* src/compiler/Compiler.cpp:
(TCompiler::Init):
(TCompiler::compile):
(TCompiler::clearResults):
(TCompiler::collectAttribsUniforms):
(TCompiler::enforcePackingRestrictions):
* src/compiler/Diagnostics.cpp:
(TDiagnostics::TDiagnostics):
(TDiagnostics::writeInfo):
(TDiagnostics::print):
* src/compiler/Diagnostics.h:
(TDiagnostics::numErrors):
(TDiagnostics::numWarnings):
(TDiagnostics):
* src/compiler/DirectiveHandler.h:
* src/compiler/HashNames.h: Added.
* src/compiler/Intermediate.cpp:
(TIntermTraverser::hash):
* src/compiler/OutputESSL.cpp:
(TOutputESSL::TOutputESSL):
* src/compiler/OutputESSL.h:
(TOutputESSL):
* src/compiler/OutputGLSL.cpp:
(TOutputGLSL::TOutputGLSL):
* src/compiler/OutputGLSL.h:
(TOutputGLSL):
* src/compiler/OutputGLSLBase.cpp:
(TOutputGLSLBase::TOutputGLSLBase):
(TOutputGLSLBase::writeVariableType):
(TOutputGLSLBase::writeFunctionParameters):
(TOutputGLSLBase::writeConstantUnion):
(TOutputGLSLBase::visitSymbol):
(TOutputGLSLBase::visitBinary):
(TOutputGLSLBase::visitAggregate):
(TOutputGLSLBase::getTypeName):
(TOutputGLSLBase::hashName):
(TOutputGLSLBase::hashVariableName):
(TOutputGLSLBase::hashFunctionName):
* src/compiler/OutputGLSLBase.h:
(TOutputGLSLBase):
* src/compiler/OutputHLSL.cpp:
(sh::OutputHLSL::OutputHLSL):
(sh::OutputHLSL::header):
(sh::OutputHLSL::visitAggregate):
(sh::OutputHLSL::visitBranch):
(sh::OutputHLSL::handleExcessiveLoop):
* src/compiler/OutputHLSL.h:
(OutputHLSL):
* src/compiler/ParseHelper.cpp:
(TParseContext::error):
(TParseContext::nonInitConstErrorCheck):
(PaParseStrings):
* src/compiler/ParseHelper.h:
(TParseContext::TParseContext):
(TParseContext):
(TParseContext::numErrors):
* src/compiler/RenameFunction.h:
(RenameFunction::visitAggregate):
* src/compiler/ShHandle.h:
(TCompiler::getHashFunction):
(TCompiler::getNameMap):
(TCompiler::getSymbolTable):
(TCompiler):
* src/compiler/ShaderLang.cpp:
(ShInitBuiltInResources):
(ShGetInfo):
(ShGetNameHashingEntry):
* src/compiler/SymbolTable.cpp:
(TType::TType):
(TType::isStructureContainingArrays):
* src/compiler/SymbolTable.h:
(TSymbolTable::findBuiltIn):
(TSymbolTable):
* src/compiler/TranslatorESSL.cpp:
(TranslatorESSL::translate):
* src/compiler/TranslatorGLSL.cpp:
(TranslatorGLSL::translate):
* src/compiler/Types.h:
(TType):
(TPublicType):
(TPublicType::setBasic):
(TPublicType::setAggregate):
(TPublicType::setArray):
(TPublicType::isStructureContainingArrays):
* src/compiler/UnfoldShortCircuit.cpp:
(sh::UnfoldShortCircuit::visitBinary):
* src/compiler/VariableInfo.cpp:
(getVariableInfo):
(getUserDefinedVariableInfo):
(TVariableInfo::TVariableInfo):
(CollectAttribsUniforms::CollectAttribsUniforms):
(CollectAttribsUniforms::visitAggregate):
* src/compiler/VariableInfo.h:
(TVariableInfo):
(CollectAttribsUniforms):
* src/compiler/VariablePacker.cpp: Added.
(VariablePacker::GetNumComponentsPerRow):
(VariablePacker::GetNumRows):
(TVariableInfoComparer::operator()):
(VariablePacker::makeColumnFlags):
(VariablePacker::fillColumns):
(VariablePacker::searchColumn):
(VariablePacker::CheckVariablesWithinPackingLimits):
* src/compiler/VariablePacker.h: Added.
(VariablePacker):
* src/compiler/VersionGLSL.cpp:
(TVersionGLSL::visitAggregate):
* src/compiler/VersionGLSL.h:
(TVersionGLSL):
* src/compiler/glslang.l:
* src/compiler/glslang.y:
* src/compiler/glslang_lex.cpp:
(string_input):
(glslang_finalize):
(glslang_scan):
* src/compiler/glslang_tab.cpp:
* src/compiler/intermediate.h:
(TIntermTraverser):
* src/compiler/osinclude.h:
(OS_GetTLSValue):
* src/compiler/ossource_nspr.cpp:
* src/compiler/preprocessor/DiagnosticsBase.cpp: Added.
(pp):
(pp::Diagnostics::~Diagnostics):
(pp::Diagnostics::report):
(pp::Diagnostics::severity):
(pp::Diagnostics::message):
* src/compiler/preprocessor/DiagnosticsBase.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Diagnostics.h.
(pp):
(Diagnostics):
* src/compiler/preprocessor/DirectiveHandlerBase.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveHandlerBase.cpp.
(pp):
(pp::DirectiveHandler::~DirectiveHandler):
* src/compiler/preprocessor/DirectiveHandlerBase.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveHandler.h.
(pp):
(DirectiveHandler):
* src/compiler/preprocessor/DirectiveParser.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.cpp.
(getDirective):
(isConditionalDirective):
(isEOD):
(skipUntilEOD):
(isMacroNameReserved):
(isMacroPredefined):
(pp):
(DefinedParser):
(pp::DefinedParser::DefinedParser):
(pp::DefinedParser::lex):
(pp::DirectiveParser::DirectiveParser):
(pp::DirectiveParser::lex):
(pp::DirectiveParser::parseDirective):
(pp::DirectiveParser::parseDefine):
(pp::DirectiveParser::parseUndef):
(pp::DirectiveParser::parseIf):
(pp::DirectiveParser::parseIfdef):
(pp::DirectiveParser::parseIfndef):
(pp::DirectiveParser::parseElse):
(pp::DirectiveParser::parseElif):
(pp::DirectiveParser::parseEndif):
(pp::DirectiveParser::parseError):
(pp::DirectiveParser::parsePragma):
(pp::DirectiveParser::parseExtension):
(pp::DirectiveParser::parseVersion):
(pp::DirectiveParser::parseLine):
(pp::DirectiveParser::skipping):
(pp::DirectiveParser::parseConditionalIf):
(pp::DirectiveParser::parseExpressionIf):
(pp::DirectiveParser::parseExpressionIfdef):
* src/compiler/preprocessor/DirectiveParser.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DirectiveParser.h.
(pp):
(DirectiveParser):
(ConditionalBlock):
(pp::DirectiveParser::ConditionalBlock::ConditionalBlock):
* src/compiler/preprocessor/ExpressionParser.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.cpp.
(yysyntax_error):
(yylex):
(yyerror):
(pp):
(pp::ExpressionParser::ExpressionParser):
(pp::ExpressionParser::parse):
* src/compiler/preprocessor/ExpressionParser.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.h.
(pp):
(ExpressionParser):
* src/compiler/preprocessor/ExpressionParser.y: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.y.
* src/compiler/preprocessor/Input.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Input.cpp.
(pp):
(pp::Input::Input):
(pp::Input::read):
* src/compiler/preprocessor/Input.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Input.h.
(pp):
(Input):
(pp::Input::count):
(pp::Input::string):
(pp::Input::length):
(Location):
(pp::Input::Location::Location):
(pp::Input::readLoc):
* src/compiler/preprocessor/Lexer.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Lexer.cpp.
(pp):
(pp::Lexer::~Lexer):
* src/compiler/preprocessor/Lexer.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Lexer.h.
(pp):
(Lexer):
* src/compiler/preprocessor/Macro.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Macro.cpp.
(pp):
(pp::Macro::equals):
* src/compiler/preprocessor/Macro.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Macro.h.
(pp):
(pp::Macro::Macro):
(Macro):
* src/compiler/preprocessor/MacroExpander.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.cpp.
(pp):
(TokenLexer):
(pp::TokenLexer::TokenLexer):
(pp::TokenLexer::lex):
(pp::MacroExpander::MacroExpander):
(pp::MacroExpander::~MacroExpander):
(pp::MacroExpander::lex):
(pp::MacroExpander::getToken):
(pp::MacroExpander::ungetToken):
(pp::MacroExpander::isNextTokenLeftParen):
(pp::MacroExpander::pushMacro):
(pp::MacroExpander::popMacro):
(pp::MacroExpander::expandMacro):
(pp::MacroExpander::collectMacroArgs):
(pp::MacroExpander::replaceMacroParams):
* src/compiler/preprocessor/MacroExpander.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/MacroExpander.h.
(pp):
(MacroExpander):
(MacroContext):
(pp::MacroExpander::MacroContext::MacroContext):
(pp::MacroExpander::MacroContext::empty):
(pp::MacroExpander::MacroContext::get):
(pp::MacroExpander::MacroContext::unget):
* src/compiler/preprocessor/Preprocessor.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Preprocessor.cpp.
(pp):
(PreprocessorImpl):
(pp::PreprocessorImpl::PreprocessorImpl):
(pp::Preprocessor::Preprocessor):
(pp::Preprocessor::~Preprocessor):
(pp::Preprocessor::init):
(pp::Preprocessor::predefineMacro):
(pp::Preprocessor::lex):
* src/compiler/preprocessor/Preprocessor.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Preprocessor.h.
(pp):
(Preprocessor):
* src/compiler/preprocessor/SourceLocation.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/SourceLocation.h.
(pp):
(pp::SourceLocation::SourceLocation):
(SourceLocation):
(pp::SourceLocation::equals):
(pp::operator==):
(pp::operator!=):
* src/compiler/preprocessor/Token.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Token.cpp.
(pp):
(pp::Token::reset):
(pp::Token::equals):
(pp::Token::setAtStartOfLine):
(pp::Token::setHasLeadingSpace):
(pp::Token::setExpansionDisabled):
(pp::Token::iValue):
(pp::Token::uValue):
(pp::Token::fValue):
(pp::operator<<):
* src/compiler/preprocessor/Token.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Token.h.
(pp):
(pp::Token::Token):
(Token):
(pp::Token::atStartOfLine):
(pp::Token::hasLeadingSpace):
(pp::Token::expansionDisabled):
(pp::operator==):
(pp::operator!=):
* src/compiler/preprocessor/Tokenizer.cpp: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Tokenizer.cpp.
(yy_buffer_state):
(yy_trans_info):
(yyguts_t):
(yy_get_previous_state):
(yy_try_NUL_trans):
(input):
(pprestart):
(pp_switch_to_buffer):
(pp_load_buffer_state):
(pp_create_buffer):
(pp_delete_buffer):
(pp_init_buffer):
(pp_flush_buffer):
(pppush_buffer_state):
(pppop_buffer_state):
(ppensure_buffer_stack):
(pp_scan_buffer):
(pp_scan_string):
(pp_scan_bytes):
(yy_fatal_error):
(ppget_extra):
(ppget_lineno):
(ppget_column):
(ppget_in):
(ppget_out):
(ppget_leng):
(ppget_text):
(ppset_extra):
(ppset_lineno):
(ppset_column):
(ppset_in):
(ppset_out):
(ppget_debug):
(ppset_debug):
(ppget_lval):
(ppset_lval):
(ppget_lloc):
(ppset_lloc):
(pplex_init):
(pplex_init_extra):
(yy_init_globals):
(pplex_destroy):
(yy_flex_strncpy):
(yy_flex_strlen):
(ppalloc):
(pprealloc):
(ppfree):
(pp):
(pp::Tokenizer::Tokenizer):
(pp::Tokenizer::~Tokenizer):
(pp::Tokenizer::init):
(pp::Tokenizer::setFileNumber):
(pp::Tokenizer::setLineNumber):
(pp::Tokenizer::lex):
(pp::Tokenizer::initScanner):
(pp::Tokenizer::destroyScanner):
* src/compiler/preprocessor/Tokenizer.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Tokenizer.h.
(pp):
(Tokenizer):
(Context):
* src/compiler/preprocessor/Tokenizer.l: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Tokenizer.l.
* src/compiler/preprocessor/atom.c: Removed.
* src/compiler/preprocessor/atom.h: Removed.
* src/compiler/preprocessor/compile.h: Removed.
* src/compiler/preprocessor/cpp.c: Removed.
* src/compiler/preprocessor/cpp.h: Removed.
* src/compiler/preprocessor/cppstruct.c: Removed.
* src/compiler/preprocessor/generate_parser.sh: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/generate_parser.sh.
* src/compiler/preprocessor/memory.c: Removed.
* src/compiler/preprocessor/memory.h: Removed.
* src/compiler/preprocessor/new/DiagnosticsBase.cpp: Removed.
* src/compiler/preprocessor/new/new_file.cpp: Removed.
* src/compiler/preprocessor/new/new_file2.cpp: Removed.
* src/compiler/preprocessor/new/preprocessor.vcproj: Removed.
* src/compiler/preprocessor/numeric_lex.h: Added.
(pp):
(pp::numeric_base_int):
(pp::numeric_lex_int):
(pp::numeric_lex_float):
* src/compiler/preprocessor/parser.h: Removed.
* src/compiler/preprocessor/pp_utils.h: Renamed from Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/pp_utils.h.
* src/compiler/preprocessor/preprocess.h: Removed.
* src/compiler/preprocessor/scanner.c: Removed.
* src/compiler/preprocessor/scanner.h: Removed.
* src/compiler/preprocessor/slglobals.h: Removed.
* src/compiler/preprocessor/symbols.c: Removed.
* src/compiler/preprocessor/symbols.h: Removed.
* src/compiler/preprocessor/tokens.c: Removed.
* src/compiler/preprocessor/tokens.h: Removed.
* src/libEGL/Config.cpp: Removed.
* src/libEGL/Config.h: Removed.
* src/libEGL/Display.cpp: Removed.
* src/libEGL/Display.h: Removed.
* src/libEGL/README: Added.
* src/libEGL/Surface.cpp: Removed.
* src/libEGL/Surface.h: Removed.
* src/libEGL/libEGL.cpp: Removed.
* src/libEGL/libEGL.def: Removed.
* src/libEGL/libEGL.rc: Removed.
* src/libEGL/libEGL.vcproj: Removed.
* src/libEGL/main.cpp: Removed.
* src/libEGL/main.h: Removed.
* src/libEGL/resource.h: Removed.
* src/libGLESv2/Blit.cpp: Removed.
* src/libGLESv2/Blit.h: Removed.
* src/libGLESv2/Buffer.cpp: Removed.
* src/libGLESv2/Buffer.h: Removed.
* src/libGLESv2/Context.cpp: Removed.
* src/libGLESv2/Context.h: Removed.
* src/libGLESv2/Fence.cpp: Removed.
* src/libGLESv2/Fence.h: Removed.
* src/libGLESv2/Framebuffer.cpp: Removed.
* src/libGLESv2/Framebuffer.h: Removed.
* src/libGLESv2/HandleAllocator.cpp: Removed.
* src/libGLESv2/HandleAllocator.h: Removed.
* src/libGLESv2/IndexDataManager.cpp: Removed.
* src/libGLESv2/IndexDataManager.h: Removed.
* src/libGLESv2/Program.cpp: Removed.
* src/libGLESv2/Program.h: Removed.
* src/libGLESv2/ProgramBinary.cpp: Removed.
* src/libGLESv2/ProgramBinary.h: Removed.
* src/libGLESv2/Query.cpp: Removed.
* src/libGLESv2/Query.h: Removed.
* src/libGLESv2/README: Added.
* src/libGLESv2/Renderbuffer.cpp: Removed.
* src/libGLESv2/Renderbuffer.h: Removed.
* src/libGLESv2/ResourceManager.cpp: Removed.
* src/libGLESv2/ResourceManager.h: Removed.
* src/libGLESv2/Shader.cpp: Removed.
* src/libGLESv2/Shader.h: Removed.
* src/libGLESv2/Texture.cpp: Removed.
* src/libGLESv2/Texture.h: Removed.
* src/libGLESv2/VertexDataManager.cpp: Removed.
* src/libGLESv2/VertexDataManager.h: Removed.
* src/libGLESv2/libGLESv2.cpp: Removed.
* src/libGLESv2/libGLESv2.def: Removed.
* src/libGLESv2/libGLESv2.rc: Removed.
* src/libGLESv2/libGLESv2.vcproj: Removed.
* src/libGLESv2/main.cpp: Removed.
* src/libGLESv2/main.h: Removed.
* src/libGLESv2/mathutil.h: Removed.
* src/libGLESv2/resource.h: Removed.
* src/libGLESv2/utilities.cpp: Removed.
* src/libGLESv2/utilities.h: Removed.
* src/libGLESv2/vertexconversion.h: Removed.

Source/WebCore:

Update the files used in the EFL and GTK builds.

No new tests. No change in behavior.

* CMakeLists.txt:
* GNUmakefile.list.am:

Source/WebKit:

* PlatformEfl.cmake: Add ANGLE/include to the include directories list because ShaderLang.h
now includes "KHR/khrplatform.h", which is located in ANGLE/include/KHR/khrplatform.h.

Source/WebKit2:

* PlatformEfl.cmake: Add ANGLE/include to the include directories list because ShaderLang.h
now includes "KHR/khrplatform.h", which is located in ANGLE/include/KHR/khrplatform.h.



Canonical link: https://commits.webkit.org/125055@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139665 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
mvujovic committed Jan 14, 2013
1 parent ad3fbea commit 6e867d95323a1920d481253cc331c415763de567
Showing with 2,241 additions and 38,372 deletions.
  1. +19 −19 Source/ThirdParty/ANGLE/ANGLE.plist
  2. +2 −1 Source/ThirdParty/ANGLE/ANGLE.pri
  3. +145 −305 Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
  4. +476 −0 Source/ThirdParty/ANGLE/ChangeLog
  5. +2 −2 Source/ThirdParty/ANGLE/DerivedSources.pri
  6. +25 −38 Source/ThirdParty/ANGLE/Target.pri
  7. +42 −2 Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
  8. +0 −935 Source/ThirdParty/ANGLE/src/build_angle.xcodeproj/project.pbxproj
  9. +4 −0 Source/ThirdParty/ANGLE/src/common/angleutils.h
  10. +6 −0 Source/ThirdParty/ANGLE/src/common/debug.cpp
  11. +6 −4 Source/ThirdParty/ANGLE/src/common/debug.h
  12. +3 −1 Source/ThirdParty/ANGLE/src/common/version.h
  13. +26 −4 Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp
  14. +23 −4 Source/ThirdParty/ANGLE/src/compiler/Diagnostics.cpp
  15. +6 −1 Source/ThirdParty/ANGLE/src/compiler/Diagnostics.h
  16. +1 −1 Source/ThirdParty/ANGLE/src/compiler/DirectiveHandler.h
  17. +19 −0 Source/ThirdParty/ANGLE/src/compiler/HashNames.h
  18. +12 −0 Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp
  19. +5 −2 Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp
  20. +4 −1 Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h
  21. +5 −2 Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.cpp
  22. +4 −1 Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.h
  23. +74 −42 Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp
  24. +20 −1 Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.h
  25. +70 −25 Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.cpp
  26. +2 −0 Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.h
  27. +20 −9 Source/ThirdParty/ANGLE/src/compiler/ParseHelper.cpp
  28. +4 −5 Source/ThirdParty/ANGLE/src/compiler/ParseHelper.h
  29. +1 −1 Source/ThirdParty/ANGLE/src/compiler/RenameFunction.h
  30. +14 −0 Source/ThirdParty/ANGLE/src/compiler/ShHandle.h
  31. +62 −0 Source/ThirdParty/ANGLE/src/compiler/ShaderLang.cpp
  32. +30 −4 Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
  33. +5 −0 Source/ThirdParty/ANGLE/src/compiler/SymbolTable.h
  34. +1 −1 Source/ThirdParty/ANGLE/src/compiler/TranslatorESSL.cpp
  35. +1 −1 Source/ThirdParty/ANGLE/src/compiler/TranslatorGLSL.cpp
  36. +67 −60 Source/ThirdParty/ANGLE/src/compiler/Types.h
  37. +2 −2 Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuit.cpp
  38. +33 −11 Source/ThirdParty/ANGLE/src/compiler/VariableInfo.cpp
  39. +7 −1 Source/ThirdParty/ANGLE/src/compiler/VariableInfo.h
  40. +297 −0 Source/ThirdParty/ANGLE/src/compiler/VariablePacker.cpp
  41. +41 −0 Source/ThirdParty/ANGLE/src/compiler/VariablePacker.h
  42. +31 −6 Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.cpp
  43. +7 −3 Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h
  44. +3 −154 Source/ThirdParty/ANGLE/src/compiler/glslang.l
  45. +18 −17 Source/ThirdParty/ANGLE/src/compiler/glslang.y
  46. +5 −155 Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp
  47. +38 −37 Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp
  48. +6 −0 Source/ThirdParty/ANGLE/src/compiler/intermediate.h
  49. +5 −12 Source/ThirdParty/ANGLE/src/compiler/osinclude.h
  50. +0 −43 Source/ThirdParty/ANGLE/src/compiler/ossource_nspr.cpp
  51. +127 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp
  52. +6 −1 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new/Diagnostics.h → DiagnosticsBase.h}
  53. +1 −1 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/DirectiveHandlerBase.cpp
  54. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new/DirectiveHandler.h → DirectiveHandlerBase.h}
  55. +98 −65 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/DirectiveParser.cpp
  56. +1 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/DirectiveParser.h
  57. +25 −11 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/ExpressionParser.cpp
  58. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/ExpressionParser.h
  59. +22 −13 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/ExpressionParser.y
  60. +2 −2 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Input.cpp
  61. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Input.h
  62. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Lexer.cpp
  63. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Lexer.h
  64. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Macro.cpp
  65. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Macro.h
  66. +19 −17 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/MacroExpander.cpp
  67. +3 −2 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/MacroExpander.h
  68. +33 −5 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Preprocessor.cpp
  69. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Preprocessor.h
  70. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/SourceLocation.h
  71. +25 −3 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Token.cpp
  72. +7 −1 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Token.h
  73. +17 −5 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Tokenizer.cpp
  74. +1 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Tokenizer.h
  75. +13 −2 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/Tokenizer.l
  76. +0 −737 Source/ThirdParty/ANGLE/src/compiler/preprocessor/atom.c
  77. +0 −63 Source/ThirdParty/ANGLE/src/compiler/preprocessor/atom.h
  78. +0 −100 Source/ThirdParty/ANGLE/src/compiler/preprocessor/compile.h
  79. +0 −1,118 Source/ThirdParty/ANGLE/src/compiler/preprocessor/cpp.c
  80. +0 −86 Source/ThirdParty/ANGLE/src/compiler/preprocessor/cpp.h
  81. +0 −152 Source/ThirdParty/ANGLE/src/compiler/preprocessor/cppstruct.c
  82. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/generate_parser.sh
  83. +0 −158 Source/ThirdParty/ANGLE/src/compiler/preprocessor/memory.c
  84. +0 −58 Source/ThirdParty/ANGLE/src/compiler/preprocessor/memory.h
  85. +0 −38 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/DiagnosticsBase.cpp
  86. +0 −1 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/new_file.cpp
  87. +0 −1 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/new_file2.cpp
  88. +0 −393 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/preprocessor.vcproj
  89. +61 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h
  90. +0 −93 Source/ThirdParty/ANGLE/src/compiler/preprocessor/parser.h
  91. 0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/{new → }/pp_utils.h
  92. +0 −50 Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocess.h
  93. +0 −698 Source/ThirdParty/ANGLE/src/compiler/preprocessor/scanner.c
  94. +0 −81 Source/ThirdParty/ANGLE/src/compiler/preprocessor/scanner.h
  95. +0 −82 Source/ThirdParty/ANGLE/src/compiler/preprocessor/slglobals.h
  96. +0 −288 Source/ThirdParty/ANGLE/src/compiler/preprocessor/symbols.c
  97. +0 −111 Source/ThirdParty/ANGLE/src/compiler/preprocessor/symbols.h
  98. +0 −467 Source/ThirdParty/ANGLE/src/compiler/preprocessor/tokens.c
  99. +0 −90 Source/ThirdParty/ANGLE/src/compiler/preprocessor/tokens.h
  100. +0 −399 Source/ThirdParty/ANGLE/src/libEGL/Config.cpp
  101. +0 −118 Source/ThirdParty/ANGLE/src/libEGL/Config.h
  102. +0 −1,250 Source/ThirdParty/ANGLE/src/libEGL/Display.cpp
  103. +0 −145 Source/ThirdParty/ANGLE/src/libEGL/Display.h
  104. +1 −0 Source/ThirdParty/ANGLE/src/libEGL/README
  105. +0 −682 Source/ThirdParty/ANGLE/src/libEGL/Surface.cpp
  106. +0 −112 Source/ThirdParty/ANGLE/src/libEGL/Surface.h
  107. +0 −1,181 Source/ThirdParty/ANGLE/src/libEGL/libEGL.cpp
  108. +0 −36 Source/ThirdParty/ANGLE/src/libEGL/libEGL.def
  109. +0 −102 Source/ThirdParty/ANGLE/src/libEGL/libEGL.rc
  110. +0 −443 Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
  111. +0 −161 Source/ThirdParty/ANGLE/src/libEGL/main.cpp
  112. +0 −61 Source/ThirdParty/ANGLE/src/libEGL/main.h
  113. +0 −14 Source/ThirdParty/ANGLE/src/libEGL/resource.h
  114. +0 −604 Source/ThirdParty/ANGLE/src/libGLESv2/Blit.cpp
  115. +0 −94 Source/ThirdParty/ANGLE/src/libGLESv2/Blit.h
  116. +0 −117 Source/ThirdParty/ANGLE/src/libGLESv2/Buffer.cpp
  117. +0 −61 Source/ThirdParty/ANGLE/src/libGLESv2/Buffer.h
  118. +0 −4,339 Source/ThirdParty/ANGLE/src/libGLESv2/Context.cpp
  119. +0 −661 Source/ThirdParty/ANGLE/src/libGLESv2/Context.h
  120. +0 −132 Source/ThirdParty/ANGLE/src/libGLESv2/Fence.cpp
  121. +0 −49 Source/ThirdParty/ANGLE/src/libGLESv2/Fence.h
  122. +0 −509 Source/ThirdParty/ANGLE/src/libGLESv2/Framebuffer.cpp
  123. +0 −98 Source/ThirdParty/ANGLE/src/libGLESv2/Framebuffer.h
  124. +0 −63 Source/ThirdParty/ANGLE/src/libGLESv2/HandleAllocator.cpp
  125. +0 −45 Source/ThirdParty/ANGLE/src/libGLESv2/HandleAllocator.h
  126. +0 −473 Source/ThirdParty/ANGLE/src/libGLESv2/IndexDataManager.cpp
  127. +0 −149 Source/ThirdParty/ANGLE/src/libGLESv2/IndexDataManager.h
  128. +0 −507 Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp
  129. +0 −126 Source/ThirdParty/ANGLE/src/libGLESv2/Program.h
  130. +0 −2,480 Source/ThirdParty/ANGLE/src/libGLESv2/ProgramBinary.cpp
  131. +0 −211 Source/ThirdParty/ANGLE/src/libGLESv2/ProgramBinary.h
  132. +0 −128 Source/ThirdParty/ANGLE/src/libGLESv2/Query.cpp
  133. +0 −48 Source/ThirdParty/ANGLE/src/libGLESv2/Query.h
  134. +1 −0 Source/ThirdParty/ANGLE/src/libGLESv2/README
  135. +0 −577 Source/ThirdParty/ANGLE/src/libGLESv2/Renderbuffer.cpp
  136. +0 −257 Source/ThirdParty/ANGLE/src/libGLESv2/Renderbuffer.h
  137. +0 −320 Source/ThirdParty/ANGLE/src/libGLESv2/ResourceManager.cpp
  138. +0 −104 Source/ThirdParty/ANGLE/src/libGLESv2/ResourceManager.h
  139. +0 −584 Source/ThirdParty/ANGLE/src/libGLESv2/Shader.cpp
  140. +0 −166 Source/ThirdParty/ANGLE/src/libGLESv2/Shader.h
  141. +0 −2,909 Source/ThirdParty/ANGLE/src/libGLESv2/Texture.cpp
  142. +0 −427 Source/ThirdParty/ANGLE/src/libGLESv2/Texture.h
  143. +0 −784 Source/ThirdParty/ANGLE/src/libGLESv2/VertexDataManager.cpp
  144. +0 −169 Source/ThirdParty/ANGLE/src/libGLESv2/VertexDataManager.h
  145. +0 −6,975 Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.cpp
  146. +0 −180 Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def
  147. +0 −102 Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.rc
  148. +0 −561 Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
  149. +0 −176 Source/ThirdParty/ANGLE/src/libGLESv2/main.cpp
  150. +0 −50 Source/ThirdParty/ANGLE/src/libGLESv2/main.h
  151. +0 −99 Source/ThirdParty/ANGLE/src/libGLESv2/mathutil.h
  152. +0 −14 Source/ThirdParty/ANGLE/src/libGLESv2/resource.h
  153. +0 −1,035 Source/ThirdParty/ANGLE/src/libGLESv2/utilities.cpp
  154. +0 −112 Source/ThirdParty/ANGLE/src/libGLESv2/utilities.h
  155. +0 −208 Source/ThirdParty/ANGLE/src/libGLESv2/vertexconversion.h
  156. +12 −18 Source/WebCore/CMakeLists.txt
  157. +16 −0 Source/WebCore/ChangeLog
  158. +25 −41 Source/WebCore/GNUmakefile.list.am
  159. +12 −0 Source/WebKit/ChangeLog
  160. +1 −0 Source/WebKit/PlatformEfl.cmake
  161. +12 −0 Source/WebKit2/ChangeLog
  162. +1 −0 Source/WebKit2/PlatformEfl.cmake
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>OpenSourceProject</key>
<string>ANGLE</string>
<key>OpenSourceVersion</key>
<string>r1170</string>
<key>OpenSourceWebsiteURL</key>
<string>http://code.google.com/p/angleproject/</string>
<key>OpenSourceSCM</key>
<string>svn co -r1170 http://angleproject.googlecode.com/svn/trunk/</string>
<key>OpenSourceImportDate</key>
<string>2012-06-17</string>
<key>OpenSourceLicense</key>
<string>BSD</string>
<key>OpenSourceLicenseFile</key>
<string>ANGLE.txt</string>
</dict>
</array>
</plist>
<array>
<dict>
<key>OpenSourceProject</key>
<string>ANGLE</string>
<key>OpenSourceVersion</key>
<string>r1641</string>
<key>OpenSourceWebsiteURL</key>
<string>http://code.google.com/p/angleproject/</string>
<key>OpenSourceSCM</key>
<string>svn co -r1641 http://angleproject.googlecode.com/svn/trunk/</string>
<key>OpenSourceImportDate</key>
<string>2013-01-04</string>
<key>OpenSourceLicense</key>
<string>BSD</string>
<key>OpenSourceLicenseFile</key>
<string>ANGLE.txt</string>
</dict>
</array>
</plist>
@@ -8,5 +8,6 @@
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ThirdParty/ANGLE

INCLUDEPATH += \
$$SOURCE_DIR/include/GLSLANG
$$SOURCE_DIR/include/GLSLANG \
$$SOURCE_DIR/include

Large diffs are not rendered by default.

0 comments on commit 6e867d9

Please sign in to comment.