Update ANGLE
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Apr 2016 19:46:21 +0000 (19:46 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Apr 2016 19:46:21 +0000 (19:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=156755

Reviewed by Dean Jackson.

Source/ThirdParty/ANGLE:

Huge list of changed files omitted.

Source/WebCore:

* CMakeLists.txt:
* platform/graphics/ANGLEWebKitBridge.h:
(WebCore::ANGLEWebKitBridge::getResources):
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):
Continue to compile successfully with new ANGLE.

LayoutTests:

* webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved-expected.txt: Removed.
* webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved.html: Removed.
Removed invalid test based on https://github.com/KhronosGroup/WebGL/pull/1230

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@199738 268f45cc-cd09-0410-ab3c-d52691b4dbfc

650 files changed:
LayoutTests/ChangeLog
LayoutTests/webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved-expected.txt [deleted file]
LayoutTests/webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved.html [deleted file]
Source/ThirdParty/ANGLE/ANGLE.plist
Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
Source/ThirdParty/ANGLE/AUTHORS
Source/ThirdParty/ANGLE/BUILD.gn
Source/ThirdParty/ANGLE/CMakeLists.txt
Source/ThirdParty/ANGLE/CONTRIBUTORS
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/DEPS
Source/ThirdParty/ANGLE/README.md
Source/ThirdParty/ANGLE/angle.isolate
Source/ThirdParty/ANGLE/changes.diff
Source/ThirdParty/ANGLE/codereview.settings
Source/ThirdParty/ANGLE/include/EGL/eglext.h
Source/ThirdParty/ANGLE/include/EGL/eglplatform.h
Source/ThirdParty/ANGLE/include/GLES2/gl2.h
Source/ThirdParty/ANGLE/include/GLES2/gl2ext.h
Source/ThirdParty/ANGLE/include/GLES2/gl2platform.h
Source/ThirdParty/ANGLE/include/GLES3/gl3.h
Source/ThirdParty/ANGLE/include/GLES3/gl31.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/include/GLES3/gl32.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/include/GLES3/gl3platform.h
Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
Source/ThirdParty/ANGLE/include/angle_gl.h
Source/ThirdParty/ANGLE/include/angle_windowsstore.h
Source/ThirdParty/ANGLE/include/platform/Platform.h
Source/ThirdParty/ANGLE/src/angle.gyp
Source/ThirdParty/ANGLE/src/common/BitSetIterator.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/BitSetIterator_unittest.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/Float16ToFloat32.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/Float16ToFloat32.py [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/Optional.h
Source/ThirdParty/ANGLE/src/common/Optional_unittest.cpp
Source/ThirdParty/ANGLE/src/common/angleutils.cpp
Source/ThirdParty/ANGLE/src/common/angleutils.h
Source/ThirdParty/ANGLE/src/common/debug.cpp
Source/ThirdParty/ANGLE/src/common/debug.h
Source/ThirdParty/ANGLE/src/common/mathutil.cpp
Source/ThirdParty/ANGLE/src/common/mathutil.h
Source/ThirdParty/ANGLE/src/common/mathutil_unittest.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/matrix_utils.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/matrix_utils_unittest.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/string_utils.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/string_utils.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/string_utils_unittest.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/common/utilities.cpp
Source/ThirdParty/ANGLE/src/common/utilities.h
Source/ThirdParty/ANGLE/src/common/version.h
Source/ThirdParty/ANGLE/src/compiler.gypi
Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp
Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h
Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp
Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.h
Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.h
Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y
Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.cpp
Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h
Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.cpp
Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h
Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.cpp
Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h
Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.cpp
Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp
Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.h
Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.l
Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h
Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/ASTMetadataHLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/ArrayReturnValueToOutParameter.h
Source/ThirdParty/ANGLE/src/compiler/translator/BaseTypes.h
Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.h
Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorGLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/Cache.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/Cache.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/CallDAG.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/CodeGen.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/Common.h
Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/Compiler.h
Source/ThirdParty/ANGLE/src/compiler/translator/DeferGlobalInitializers.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/DeferGlobalInitializers.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/Diagnostics.h
Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/DirectiveHandler.h
Source/ThirdParty/ANGLE/src/compiler/translator/EmulatePrecision.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/EmulatePrecision.h
Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionBehavior.h
Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/ExtensionGLSL.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/FlagStd140Structs.h
Source/ThirdParty/ANGLE/src/compiler/translator/ForLoopUnroll.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/ForLoopUnroll.h
Source/ThirdParty/ANGLE/src/compiler/translator/InfoSink.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/Initialize.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/InitializeDll.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/InitializeParseContext.h
Source/ThirdParty/ANGLE/src/compiler/translator/InitializeVariables.h
Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/IntermNode.h
Source/ThirdParty/ANGLE/src/compiler/translator/IntermTraverse.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/Intermediate.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/NodeSearch.h
Source/ThirdParty/ANGLE/src/compiler/translator/Operator.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/Operator.h
Source/ThirdParty/ANGLE/src/compiler/translator/OutputESSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/OutputGLSLBase.h
Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/OutputHLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/ParseContext.h
Source/ThirdParty/ANGLE/src/compiler/translator/PoolAlloc.h
Source/ThirdParty/ANGLE/src/compiler/translator/QualifierAlive.cpp [deleted file]
Source/ThirdParty/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/RecordConstantPrecision.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/RegenerateStructNames.h
Source/ThirdParty/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/RemoveDynamicIndexing.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/RemovePow.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/RemovePow.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/RenameFunction.h
Source/ThirdParty/ANGLE/src/compiler/translator/RewriteDoWhile.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/RewriteDoWhile.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/RewriteElseBlocks.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/RewriteElseBlocks.h
Source/ThirdParty/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.h
Source/ThirdParty/ANGLE/src/compiler/translator/SearchSymbol.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/SearchSymbol.h
Source/ThirdParty/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/SeparateArrayInitialization.h
Source/ThirdParty/ANGLE/src/compiler/translator/SeparateDeclarations.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/SeparateDeclarations.h
Source/ThirdParty/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/ShaderLang.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/ShaderVars.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/SimplifyArrayAssignment.cpp [deleted file]
Source/ThirdParty/ANGLE/src/compiler/translator/SimplifyArrayAssignment.h [deleted file]
Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/StructureHLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/SymbolTable.h
Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorESSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorESSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorGLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorGLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorHLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/Types.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/Types.h
Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuit.cpp [deleted file]
Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuit.h [deleted file]
Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.h
Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/UniformHLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/UniformHLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/UtilsHLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateGlobalInitializer.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateLimitations.h
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateMaxParameters.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateMaxParameters.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateOutputs.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateOutputs.h
Source/ThirdParty/ANGLE/src/compiler/translator/ValidateSwitch.h
Source/ThirdParty/ANGLE/src/compiler/translator/VariableInfo.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/VariableInfo.h
Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/VersionGLSL.h
Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/blocklayout.h
Source/ThirdParty/ANGLE/src/compiler/translator/blocklayoutHLSL.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/depgraph/DependencyGraph.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/depgraph/DependencyGraph.h
Source/ThirdParty/ANGLE/src/compiler/translator/depgraph/DependencyGraphBuilder.h
Source/ThirdParty/ANGLE/src/compiler/translator/depgraph/DependencyGraphOutput.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/generate_parser.sh
Source/ThirdParty/ANGLE/src/compiler/translator/glslang.h
Source/ThirdParty/ANGLE/src/compiler/translator/glslang.l
Source/ThirdParty/ANGLE/src/compiler/translator/glslang.y
Source/ThirdParty/ANGLE/src/compiler/translator/glslang_lex.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.h
Source/ThirdParty/ANGLE/src/compiler/translator/intermOut.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/intermediate.h
Source/ThirdParty/ANGLE/src/compiler/translator/parseConst.cpp [deleted file]
Source/ThirdParty/ANGLE/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/timing/RestrictVertexShaderTiming.h
Source/ThirdParty/ANGLE/src/compiler/translator/util.cpp
Source/ThirdParty/ANGLE/src/compiler/translator/util.h
Source/ThirdParty/ANGLE/src/copy_compiler_dll.bat
Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.cpp
Source/ThirdParty/ANGLE/src/libANGLE/AttributeMap.h
Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream.h
Source/ThirdParty/ANGLE/src/libANGLE/BinaryStream_unittest.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Buffer.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Buffer.h
Source/ThirdParty/ANGLE/src/libANGLE/Caps.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Caps.h
Source/ThirdParty/ANGLE/src/libANGLE/Compiler.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Compiler.h
Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Config.h
Source/ThirdParty/ANGLE/src/libANGLE/Config_unittest.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Context.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Context.h
Source/ThirdParty/ANGLE/src/libANGLE/Data.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Data.h
Source/ThirdParty/ANGLE/src/libANGLE/Debug.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Debug.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Device.h
Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Display.h
Source/ThirdParty/ANGLE/src/libANGLE/Error.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Error.h
Source/ThirdParty/ANGLE/src/libANGLE/Error.inl
Source/ThirdParty/ANGLE/src/libANGLE/Fence.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Fence.h
Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Framebuffer.h
Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.cpp
Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.h
Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.cpp
Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator.h
Source/ThirdParty/ANGLE/src/libANGLE/HandleAllocator_unittest.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Image.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Image.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.cpp
Source/ThirdParty/ANGLE/src/libANGLE/ImageIndex.h
Source/ThirdParty/ANGLE/src/libANGLE/Image_unittest.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/IndexRangeCache.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Platform.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Program.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Program.h
Source/ThirdParty/ANGLE/src/libANGLE/Program_unittest.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Query.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Query.h
Source/ThirdParty/ANGLE/src/libANGLE/RefCountObject.cpp [deleted file]
Source/ThirdParty/ANGLE/src/libANGLE/RefCountObject.h
Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Renderbuffer.h
Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.cpp
Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager.h
Source/ThirdParty/ANGLE/src/libANGLE/ResourceManager_unittest.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Sampler.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Sampler.h
Source/ThirdParty/ANGLE/src/libANGLE/Shader.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Shader.h
Source/ThirdParty/ANGLE/src/libANGLE/State.cpp
Source/ThirdParty/ANGLE/src/libANGLE/State.h
Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Stream.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Surface.h
Source/ThirdParty/ANGLE/src/libANGLE/Surface_unittest.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Texture.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Texture.h
Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.cpp
Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback.h
Source/ThirdParty/ANGLE/src/libANGLE/TransformFeedback_unittest.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Uniform.cpp
Source/ThirdParty/ANGLE/src/libANGLE/Uniform.h
Source/ThirdParty/ANGLE/src/libANGLE/Version.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/Version.inl [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.cpp
Source/ThirdParty/ANGLE/src/libANGLE/VertexArray.h
Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.cpp
Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.h
Source/ThirdParty/ANGLE/src/libANGLE/VertexAttribute.inl [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/angletypes.cpp
Source/ThirdParty/ANGLE/src/libANGLE/angletypes.h
Source/ThirdParty/ANGLE/src/libANGLE/angletypes.inl [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/features.h
Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp
Source/ThirdParty/ANGLE/src/libANGLE/formatutils.h
Source/ThirdParty/ANGLE/src/libANGLE/histogram_macros.h
Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.cpp
Source/ThirdParty/ANGLE/src/libANGLE/queryconversions.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/BufferImpl_mock.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/CompilerImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/DeviceImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/DisplayImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/FramebufferImpl_mock.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImageImpl_mock.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/ImplFactory.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/ProgramImpl_mock.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/QueryImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/RenderbufferImpl_mock.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/Renderer.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/Renderer.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/SamplerImpl.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/ShaderImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/StreamImpl.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/TextureImpl_mock.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/TransformFeedbackImpl_mock.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/VertexArrayImpl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/BufferD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/CompilerD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DynamicHLSL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/FramebufferD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/HLSLCompiler.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ImageD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexBuffer.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/IndexDataManager.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ProgramD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderTargetD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RenderbufferD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/RendererD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SamplerD3D.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/ShaderD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureD3D.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/TextureStorage.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VaryingPacking.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VaryingPacking.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexBuffer.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/VertexDataManager.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/WorkaroundsD3D.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Blit11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Buffer11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Clear11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Image11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/NativeWindow.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Query11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/StateManager11.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Stream11.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Stream11.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Trim11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/copyvertex.inl
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/formatutils11.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_load_functions_table.py [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/load_functions_data.json [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/load_functions_table.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11vs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11vs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11vs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/shaders/generate_shaders.bat
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Buffer9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Image9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Query9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/StateManager9.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/formatutils9.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/flipyvs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/shaders/generate_shaders.bat
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/formatutilsD3D.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/imageformats.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/loadimage.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/loadimage.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/loadimage_etc.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/loadimage_etc.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BlitGL.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/BufferGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/CompilerGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FeatureSupportGL.md [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FramebufferGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/FunctionsGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ProgramGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/QueryGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RenderbufferGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SamplerGL.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/ShaderGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/StateManagerGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/SurfaceGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TextureGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/TransformFeedbackGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/VertexArrayGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/WorkaroundsGL.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.mm [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_enums.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/functionsgl_typedefs.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FBConfigCompatibility.md [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/FunctionsGLX.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/SurfaceGLX.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/platform_glx.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/FunctionsWGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/wgl_utils.h
Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
Source/ThirdParty/ANGLE/src/libANGLE/validationES.cpp
Source/ThirdParty/ANGLE/src/libANGLE/validationES.h
Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp
Source/ThirdParty/ANGLE/src/libANGLE/validationES2.h
Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp
Source/ThirdParty/ANGLE/src/libANGLE/validationES3.h
Source/ThirdParty/ANGLE/src/libANGLE/validationES_unittest.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/src/libEGL.gypi
Source/ThirdParty/ANGLE/src/libEGL/libEGL.cpp
Source/ThirdParty/ANGLE/src/libEGL/libEGL.def
Source/ThirdParty/ANGLE/src/libEGL/libEGL.rc
Source/ThirdParty/ANGLE/src/libGLESv2.gypi
Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl.cpp
Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.cpp
Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0.cpp
Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.cpp
Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_2_0_ext.h
Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_gles_3_0.cpp
Source/ThirdParty/ANGLE/src/libGLESv2/global_state.cpp
Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.cpp
Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def
Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.rc
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp
Source/ThirdParty/ANGLE/src/third_party/murmurhash/MurmurHash3.cpp
Source/ThirdParty/ANGLE/src/third_party/murmurhash/MurmurHash3.h
Source/ThirdParty/ANGLE/util/EGLWindow.cpp
Source/ThirdParty/ANGLE/util/EGLWindow.h
Source/ThirdParty/ANGLE/util/Matrix.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/util/Matrix.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/util/OSPixmap.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/util/OSWindow.cpp
Source/ThirdParty/ANGLE/util/OSWindow.h
Source/ThirdParty/ANGLE/util/Vector.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/util/Vector.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/util/geometry_utils.cpp [new file with mode: 0644]
Source/ThirdParty/ANGLE/util/geometry_utils.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/util/random_utils.cpp
Source/ThirdParty/ANGLE/util/random_utils.h
Source/ThirdParty/ANGLE/util/shader_utils.cpp
Source/ThirdParty/ANGLE/util/shader_utils.h
Source/ThirdParty/ANGLE/util/system_utils.h [new file with mode: 0644]
Source/ThirdParty/ANGLE/util/util.gyp
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

index 6470f42..359b1d5 100644 (file)
@@ -1,3 +1,14 @@
+2016-04-19  Alex Christensen  <achristensen@webkit.org>
+
+        Update ANGLE
+        https://bugs.webkit.org/show_bug.cgi?id=156755
+
+        Reviewed by Dean Jackson.
+
+        * webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved-expected.txt: Removed.
+        * webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved.html: Removed.
+        Removed invalid test based on https://github.com/KhronosGroup/WebGL/pull/1230
+
 2016-04-19  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 
         imported/w3c/web-platform-tests/streams/readable-streams/general.https.html is a flaky failure
diff --git a/LayoutTests/webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved-expected.txt b/LayoutTests/webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved-expected.txt
deleted file mode 100644 (file)
index 7d382e7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
-
-Test: ../../../resources/webgl_test_files/conformance/glsl/reserved/webgl_preprocessor_reserved.html
-PASS
-
diff --git a/LayoutTests/webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved.html b/LayoutTests/webgl/1.0.2/conformance/glsl/reserved/webgl_preprocessor_reserved.html
deleted file mode 100644 (file)
index dd6517a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- This file is auto-generated by generate-webgl-tests.py. DO NOT EDIT -->
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>WebGL Conformance Test Wrapper for webgl_preprocessor_reserved.html</title>
-<script type="text/javascript" src="../../../../resources/js-test-pre.js"></script>
-<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
-</head>
-<body>
-<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
-Test: <a href="../../../resources/webgl_test_files/conformance/glsl/reserved/webgl_preprocessor_reserved.html">../../../resources/webgl_test_files/conformance/glsl/reserved/webgl_preprocessor_reserved.html</a>
-<div id="result"></div>
-<div id="iframe">
-<iframe src="../../../resources/webgl_test_files/conformance/glsl/reserved/webgl_preprocessor_reserved.html" width="800" height="600"></iframe>
-</div>
-</body>
-</html>
index 2b5b158..b3e9e95 100644 (file)
@@ -10,7 +10,7 @@
         <key>OpenSourceWebsiteURL</key>
         <string>http://code.google.com/p/angleproject/</string>
         <key>OpenSourceSCM</key>
-        <string>git clone https://chromium.googlesource.com/angle/angle &amp;&amp; cd angle &amp;&amp; git checkout b11e2483742db884bd0af41f78f528240577356b</string>
+        <string>git clone https://chromium.googlesource.com/angle/angle &amp;&amp; cd angle &amp;&amp; git checkout 6684007a77572f3616fc453138b0ef5f7d42d038</string>
         <key>OpenSourceImportDate</key>
         <string>2014-04-29</string>
         <key>OpenSourceLicense</key>
index e74a367..5b2da1e 100644 (file)
                31012E5018B97B9B0039062F /* OutputGLSLBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012DE018B97B9B0039062F /* OutputGLSLBase.h */; };
                31012E5118B97B9B0039062F /* OutputHLSL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012DE118B97B9B0039062F /* OutputHLSL.cpp */; };
                31012E5218B97B9B0039062F /* OutputHLSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012DE218B97B9B0039062F /* OutputHLSL.h */; };
-               31012E5318B97B9B0039062F /* parseConst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012DE318B97B9B0039062F /* parseConst.cpp */; };
                31012E5418B97B9B0039062F /* ParseContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012DE418B97B9B0039062F /* ParseContext.cpp */; };
                31012E5518B97B9B0039062F /* ParseContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012DE518B97B9B0039062F /* ParseContext.h */; };
                31012E5618B97B9B0039062F /* PoolAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012DE618B97B9B0039062F /* PoolAlloc.cpp */; };
                31012E5718B97B9B0039062F /* PoolAlloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012DE718B97B9B0039062F /* PoolAlloc.h */; };
                31012E5818B97B9B0039062F /* Pragma.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012DE818B97B9B0039062F /* Pragma.h */; };
-               31012E5918B97B9B0039062F /* QualifierAlive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012DE918B97B9B0039062F /* QualifierAlive.cpp */; };
                31012E5A18B97B9B0039062F /* QualifierAlive.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012DEA18B97B9B0039062F /* QualifierAlive.h */; };
                31012E5D18B97B9B0039062F /* RenameFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012DED18B97B9B0039062F /* RenameFunction.h */; };
                31012E5E18B97B9B0039062F /* RewriteElseBlocks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012DEE18B97B9B0039062F /* RewriteElseBlocks.cpp */; };
@@ -84,8 +82,6 @@
                31012E6E18B97B9B0039062F /* TranslatorHLSL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012DFF18B97B9B0039062F /* TranslatorHLSL.cpp */; };
                31012E6F18B97B9B0039062F /* TranslatorHLSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012E0018B97B9B0039062F /* TranslatorHLSL.h */; };
                31012E7018B97B9B0039062F /* Types.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012E0118B97B9B0039062F /* Types.h */; };
-               31012E7118B97B9B0039062F /* UnfoldShortCircuit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012E0218B97B9B0039062F /* UnfoldShortCircuit.cpp */; };
-               31012E7218B97B9B0039062F /* UnfoldShortCircuit.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012E0318B97B9B0039062F /* UnfoldShortCircuit.h */; };
                31012E7318B97B9B0039062F /* UnfoldShortCircuitAST.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012E0418B97B9B0039062F /* UnfoldShortCircuitAST.cpp */; };
                31012E7418B97B9B0039062F /* UnfoldShortCircuitAST.h in Headers */ = {isa = PBXBuildFile; fileRef = 31012E0518B97B9B0039062F /* UnfoldShortCircuitAST.h */; };
                31012E7718B97B9B0039062F /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31012E0818B97B9B0039062F /* util.cpp */; };
                5C1DBC3F1B04375F00235552 /* SeparateDeclarations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBC181B04375F00235552 /* SeparateDeclarations.cpp */; };
                5C1DBC401B04375F00235552 /* SeparateDeclarations.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBC191B04375F00235552 /* SeparateDeclarations.h */; };
                5C1DBC411B04375F00235552 /* ShaderVars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBC1A1B04375F00235552 /* ShaderVars.cpp */; };
-               5C1DBC421B04375F00235552 /* SimplifyArrayAssignment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBC1B1B04375F00235552 /* SimplifyArrayAssignment.cpp */; };
-               5C1DBC431B04375F00235552 /* SimplifyArrayAssignment.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBC1C1B04375F00235552 /* SimplifyArrayAssignment.h */; };
                5C1DBC441B04375F00235552 /* Types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBC1D1B04375F00235552 /* Types.cpp */; };
                5C1DBC451B04375F00235552 /* ValidateSwitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBC1E1B04375F00235552 /* ValidateSwitch.cpp */; };
                5C1DBC461B04375F00235552 /* ValidateSwitch.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBC1F1B04375F00235552 /* ValidateSwitch.h */; };
                5C1DBE021B0438D300235552 /* Query.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBC791B0438D200235552 /* Query.h */; };
                5C1DBE031B0438D300235552 /* queryconversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBC7A1B0438D200235552 /* queryconversions.cpp */; };
                5C1DBE041B0438D300235552 /* queryconversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBC7B1B0438D200235552 /* queryconversions.h */; };
-               5C1DBE051B0438D300235552 /* RefCountObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBC7C1B0438D200235552 /* RefCountObject.cpp */; };
                5C1DBE061B0438D300235552 /* RefCountObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBC7D1B0438D200235552 /* RefCountObject.h */; };
                5C1DBE071B0438D300235552 /* Renderbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBC7E1B0438D200235552 /* Renderbuffer.cpp */; };
                5C1DBE081B0438D300235552 /* Renderbuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBC7F1B0438D200235552 /* Renderbuffer.h */; };
                5C1DBF401B0438D300235552 /* VertexArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBDD01B0438D300235552 /* VertexArray.h */; };
                5C1DBF411B0438D300235552 /* VertexAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1DBDD11B0438D300235552 /* VertexAttribute.cpp */; };
                5C1DBF421B0438D300235552 /* VertexAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1DBDD21B0438D300235552 /* VertexAttribute.h */; };
+               5C315CFE1CC5B6DA00776697 /* Cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CE81CC5B6DA00776697 /* Cache.cpp */; };
+               5C315CFF1CC5B6DA00776697 /* Cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CE91CC5B6DA00776697 /* Cache.h */; };
+               5C315D001CC5B6DA00776697 /* DeferGlobalInitializers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CEA1CC5B6DA00776697 /* DeferGlobalInitializers.cpp */; };
+               5C315D011CC5B6DA00776697 /* DeferGlobalInitializers.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CEB1CC5B6DA00776697 /* DeferGlobalInitializers.h */; };
+               5C315D021CC5B6DA00776697 /* ExtensionGLSL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CEC1CC5B6DA00776697 /* ExtensionGLSL.cpp */; };
+               5C315D031CC5B6DA00776697 /* ExtensionGLSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CED1CC5B6DA00776697 /* ExtensionGLSL.h */; };
+               5C315D041CC5B6DA00776697 /* RecordConstantPrecision.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CEE1CC5B6DA00776697 /* RecordConstantPrecision.cpp */; };
+               5C315D051CC5B6DA00776697 /* RecordConstantPrecision.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CEF1CC5B6DA00776697 /* RecordConstantPrecision.h */; };
+               5C315D061CC5B6DA00776697 /* RemoveDynamicIndexing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CF01CC5B6DA00776697 /* RemoveDynamicIndexing.cpp */; };
+               5C315D071CC5B6DA00776697 /* RemoveDynamicIndexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CF11CC5B6DA00776697 /* RemoveDynamicIndexing.h */; };
+               5C315D081CC5B6DA00776697 /* RemovePow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CF21CC5B6DA00776697 /* RemovePow.cpp */; };
+               5C315D091CC5B6DA00776697 /* RemovePow.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CF31CC5B6DA00776697 /* RemovePow.h */; };
+               5C315D0A1CC5B6DA00776697 /* RewriteDoWhile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CF41CC5B6DA00776697 /* RewriteDoWhile.cpp */; };
+               5C315D0B1CC5B6DA00776697 /* RewriteDoWhile.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CF51CC5B6DA00776697 /* RewriteDoWhile.h */; };
+               5C315D0C1CC5B6DA00776697 /* SeparateExpressionsReturningArrays.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CF61CC5B6DA00776697 /* SeparateExpressionsReturningArrays.cpp */; };
+               5C315D0D1CC5B6DA00776697 /* SeparateExpressionsReturningArrays.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CF71CC5B6DA00776697 /* SeparateExpressionsReturningArrays.h */; };
+               5C315D0E1CC5B6DA00776697 /* UnfoldShortCircuitToIf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CF81CC5B6DA00776697 /* UnfoldShortCircuitToIf.cpp */; };
+               5C315D0F1CC5B6DA00776697 /* UnfoldShortCircuitToIf.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CF91CC5B6DA00776697 /* UnfoldShortCircuitToIf.h */; };
+               5C315D101CC5B6DA00776697 /* ValidateGlobalInitializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CFA1CC5B6DA00776697 /* ValidateGlobalInitializer.cpp */; };
+               5C315D111CC5B6DA00776697 /* ValidateGlobalInitializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CFB1CC5B6DA00776697 /* ValidateGlobalInitializer.h */; };
+               5C315D121CC5B6DA00776697 /* ValidateMaxParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C315CFC1CC5B6DA00776697 /* ValidateMaxParameters.cpp */; };
+               5C315D131CC5B6DA00776697 /* ValidateMaxParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C315CFD1CC5B6DA00776697 /* ValidateMaxParameters.h */; };
                5C9FFF4E19102A000025B8FA /* FlagStd140Structs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C9FFF4C19102A000025B8FA /* FlagStd140Structs.cpp */; };
                5C9FFF4F19102A000025B8FA /* FlagStd140Structs.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9FFF4D19102A000025B8FA /* FlagStd140Structs.h */; };
                5CC7D452191024E4000B8C1F /* LoopInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC7D44B191024E3000B8C1F /* LoopInfo.cpp */; };
                31012DE018B97B9B0039062F /* OutputGLSLBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputGLSLBase.h; sourceTree = "<group>"; };
                31012DE118B97B9B0039062F /* OutputHLSL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OutputHLSL.cpp; sourceTree = "<group>"; };
                31012DE218B97B9B0039062F /* OutputHLSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputHLSL.h; sourceTree = "<group>"; };
-               31012DE318B97B9B0039062F /* parseConst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parseConst.cpp; sourceTree = "<group>"; };
                31012DE418B97B9B0039062F /* ParseContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParseContext.cpp; sourceTree = "<group>"; };
                31012DE518B97B9B0039062F /* ParseContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParseContext.h; sourceTree = "<group>"; };
                31012DE618B97B9B0039062F /* PoolAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PoolAlloc.cpp; sourceTree = "<group>"; };
                31012DE718B97B9B0039062F /* PoolAlloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PoolAlloc.h; sourceTree = "<group>"; };
                31012DE818B97B9B0039062F /* Pragma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pragma.h; sourceTree = "<group>"; };
-               31012DE918B97B9B0039062F /* QualifierAlive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifierAlive.cpp; sourceTree = "<group>"; };
                31012DEA18B97B9B0039062F /* QualifierAlive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QualifierAlive.h; sourceTree = "<group>"; };
                31012DED18B97B9B0039062F /* RenameFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenameFunction.h; sourceTree = "<group>"; };
                31012DEE18B97B9B0039062F /* RewriteElseBlocks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RewriteElseBlocks.cpp; sourceTree = "<group>"; };
                31012DFF18B97B9B0039062F /* TranslatorHLSL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TranslatorHLSL.cpp; sourceTree = "<group>"; };
                31012E0018B97B9B0039062F /* TranslatorHLSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TranslatorHLSL.h; sourceTree = "<group>"; };
                31012E0118B97B9B0039062F /* Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Types.h; sourceTree = "<group>"; };
-               31012E0218B97B9B0039062F /* UnfoldShortCircuit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnfoldShortCircuit.cpp; sourceTree = "<group>"; };
-               31012E0318B97B9B0039062F /* UnfoldShortCircuit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnfoldShortCircuit.h; sourceTree = "<group>"; };
                31012E0418B97B9B0039062F /* UnfoldShortCircuitAST.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnfoldShortCircuitAST.cpp; sourceTree = "<group>"; };
                31012E0518B97B9B0039062F /* UnfoldShortCircuitAST.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnfoldShortCircuitAST.h; sourceTree = "<group>"; };
                31012E0818B97B9B0039062F /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; };
                5C1DBC181B04375F00235552 /* SeparateDeclarations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SeparateDeclarations.cpp; sourceTree = "<group>"; };
                5C1DBC191B04375F00235552 /* SeparateDeclarations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeparateDeclarations.h; sourceTree = "<group>"; };
                5C1DBC1A1B04375F00235552 /* ShaderVars.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShaderVars.cpp; sourceTree = "<group>"; };
-               5C1DBC1B1B04375F00235552 /* SimplifyArrayAssignment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimplifyArrayAssignment.cpp; sourceTree = "<group>"; };
-               5C1DBC1C1B04375F00235552 /* SimplifyArrayAssignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimplifyArrayAssignment.h; sourceTree = "<group>"; };
                5C1DBC1D1B04375F00235552 /* Types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Types.cpp; sourceTree = "<group>"; };
                5C1DBC1E1B04375F00235552 /* ValidateSwitch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ValidateSwitch.cpp; sourceTree = "<group>"; };
                5C1DBC1F1B04375F00235552 /* ValidateSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValidateSwitch.h; sourceTree = "<group>"; };
                5C1DBC791B0438D200235552 /* Query.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Query.h; path = src/libANGLE/Query.h; sourceTree = "<group>"; };
                5C1DBC7A1B0438D200235552 /* queryconversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = queryconversions.cpp; path = src/libANGLE/queryconversions.cpp; sourceTree = "<group>"; };
                5C1DBC7B1B0438D200235552 /* queryconversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = queryconversions.h; path = src/libANGLE/queryconversions.h; sourceTree = "<group>"; };
-               5C1DBC7C1B0438D200235552 /* RefCountObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RefCountObject.cpp; path = src/libANGLE/RefCountObject.cpp; sourceTree = "<group>"; };
                5C1DBC7D1B0438D200235552 /* RefCountObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RefCountObject.h; path = src/libANGLE/RefCountObject.h; sourceTree = "<group>"; };
                5C1DBC7E1B0438D200235552 /* Renderbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Renderbuffer.cpp; path = src/libANGLE/Renderbuffer.cpp; sourceTree = "<group>"; };
                5C1DBC7F1B0438D200235552 /* Renderbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Renderbuffer.h; path = src/libANGLE/Renderbuffer.h; sourceTree = "<group>"; };
                5C1DBDD01B0438D300235552 /* VertexArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VertexArray.h; path = src/libANGLE/VertexArray.h; sourceTree = "<group>"; };
                5C1DBDD11B0438D300235552 /* VertexAttribute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VertexAttribute.cpp; path = src/libANGLE/VertexAttribute.cpp; sourceTree = "<group>"; };
                5C1DBDD21B0438D300235552 /* VertexAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VertexAttribute.h; path = src/libANGLE/VertexAttribute.h; sourceTree = "<group>"; };
+               5C315CE81CC5B6DA00776697 /* Cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cache.cpp; sourceTree = "<group>"; };
+               5C315CE91CC5B6DA00776697 /* Cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cache.h; sourceTree = "<group>"; };
+               5C315CEA1CC5B6DA00776697 /* DeferGlobalInitializers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeferGlobalInitializers.cpp; sourceTree = "<group>"; };
+               5C315CEB1CC5B6DA00776697 /* DeferGlobalInitializers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeferGlobalInitializers.h; sourceTree = "<group>"; };
+               5C315CEC1CC5B6DA00776697 /* ExtensionGLSL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionGLSL.cpp; sourceTree = "<group>"; };
+               5C315CED1CC5B6DA00776697 /* ExtensionGLSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtensionGLSL.h; sourceTree = "<group>"; };
+               5C315CEE1CC5B6DA00776697 /* RecordConstantPrecision.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecordConstantPrecision.cpp; sourceTree = "<group>"; };
+               5C315CEF1CC5B6DA00776697 /* RecordConstantPrecision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordConstantPrecision.h; sourceTree = "<group>"; };
+               5C315CF01CC5B6DA00776697 /* RemoveDynamicIndexing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoveDynamicIndexing.cpp; sourceTree = "<group>"; };
+               5C315CF11CC5B6DA00776697 /* RemoveDynamicIndexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoveDynamicIndexing.h; sourceTree = "<group>"; };
+               5C315CF21CC5B6DA00776697 /* RemovePow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemovePow.cpp; sourceTree = "<group>"; };
+               5C315CF31CC5B6DA00776697 /* RemovePow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemovePow.h; sourceTree = "<group>"; };
+               5C315CF41CC5B6DA00776697 /* RewriteDoWhile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RewriteDoWhile.cpp; sourceTree = "<group>"; };
+               5C315CF51CC5B6DA00776697 /* RewriteDoWhile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RewriteDoWhile.h; sourceTree = "<group>"; };
+               5C315CF61CC5B6DA00776697 /* SeparateExpressionsReturningArrays.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SeparateExpressionsReturningArrays.cpp; sourceTree = "<group>"; };
+               5C315CF71CC5B6DA00776697 /* SeparateExpressionsReturningArrays.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeparateExpressionsReturningArrays.h; sourceTree = "<group>"; };
+               5C315CF81CC5B6DA00776697 /* UnfoldShortCircuitToIf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnfoldShortCircuitToIf.cpp; sourceTree = "<group>"; };
+               5C315CF91CC5B6DA00776697 /* UnfoldShortCircuitToIf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnfoldShortCircuitToIf.h; sourceTree = "<group>"; };
+               5C315CFA1CC5B6DA00776697 /* ValidateGlobalInitializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ValidateGlobalInitializer.cpp; sourceTree = "<group>"; };
+               5C315CFB1CC5B6DA00776697 /* ValidateGlobalInitializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValidateGlobalInitializer.h; sourceTree = "<group>"; };
+               5C315CFC1CC5B6DA00776697 /* ValidateMaxParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ValidateMaxParameters.cpp; sourceTree = "<group>"; };
+               5C315CFD1CC5B6DA00776697 /* ValidateMaxParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValidateMaxParameters.h; sourceTree = "<group>"; };
                5C9FFF4C19102A000025B8FA /* FlagStd140Structs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlagStd140Structs.cpp; sourceTree = "<group>"; };
                5C9FFF4D19102A000025B8FA /* FlagStd140Structs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagStd140Structs.h; sourceTree = "<group>"; };
                5CC7D44B191024E3000B8C1F /* LoopInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoopInfo.cpp; sourceTree = "<group>"; };
                31012D9F18B97B9B0039062F /* translator */ = {
                        isa = PBXGroup;
                        children = (
+                               5C315CE81CC5B6DA00776697 /* Cache.cpp */,
+                               5C315CE91CC5B6DA00776697 /* Cache.h */,
+                               5C315CEA1CC5B6DA00776697 /* DeferGlobalInitializers.cpp */,
+                               5C315CEB1CC5B6DA00776697 /* DeferGlobalInitializers.h */,
+                               5C315CEC1CC5B6DA00776697 /* ExtensionGLSL.cpp */,
+                               5C315CED1CC5B6DA00776697 /* ExtensionGLSL.h */,
+                               5C315CEE1CC5B6DA00776697 /* RecordConstantPrecision.cpp */,
+                               5C315CEF1CC5B6DA00776697 /* RecordConstantPrecision.h */,
+                               5C315CF01CC5B6DA00776697 /* RemoveDynamicIndexing.cpp */,
+                               5C315CF11CC5B6DA00776697 /* RemoveDynamicIndexing.h */,
+                               5C315CF21CC5B6DA00776697 /* RemovePow.cpp */,
+                               5C315CF31CC5B6DA00776697 /* RemovePow.h */,
+                               5C315CF41CC5B6DA00776697 /* RewriteDoWhile.cpp */,
+                               5C315CF51CC5B6DA00776697 /* RewriteDoWhile.h */,
+                               5C315CF61CC5B6DA00776697 /* SeparateExpressionsReturningArrays.cpp */,
+                               5C315CF71CC5B6DA00776697 /* SeparateExpressionsReturningArrays.h */,
+                               5C315CF81CC5B6DA00776697 /* UnfoldShortCircuitToIf.cpp */,
+                               5C315CF91CC5B6DA00776697 /* UnfoldShortCircuitToIf.h */,
+                               5C315CFA1CC5B6DA00776697 /* ValidateGlobalInitializer.cpp */,
+                               5C315CFB1CC5B6DA00776697 /* ValidateGlobalInitializer.h */,
+                               5C315CFC1CC5B6DA00776697 /* ValidateMaxParameters.cpp */,
+                               5C315CFD1CC5B6DA00776697 /* ValidateMaxParameters.h */,
                                5C1DBBF91B04375E00235552 /* ArrayReturnValueToOutParameter.cpp */,
                                5C1DBBFA1B04375E00235552 /* ArrayReturnValueToOutParameter.h */,
                                5C1DBBFB1B04375F00235552 /* ASTMetadataHLSL.cpp */,
                                5C1DBC181B04375F00235552 /* SeparateDeclarations.cpp */,
                                5C1DBC191B04375F00235552 /* SeparateDeclarations.h */,
                                5C1DBC1A1B04375F00235552 /* ShaderVars.cpp */,
-                               5C1DBC1B1B04375F00235552 /* SimplifyArrayAssignment.cpp */,
-                               5C1DBC1C1B04375F00235552 /* SimplifyArrayAssignment.h */,
                                5C1DBC1D1B04375F00235552 /* Types.cpp */,
                                5C1DBC1E1B04375F00235552 /* ValidateSwitch.cpp */,
                                5C1DBC1F1B04375F00235552 /* ValidateSwitch.h */,
                                31012DE018B97B9B0039062F /* OutputGLSLBase.h */,
                                31012DE118B97B9B0039062F /* OutputHLSL.cpp */,
                                31012DE218B97B9B0039062F /* OutputHLSL.h */,
-                               31012DE318B97B9B0039062F /* parseConst.cpp */,
                                31012DE418B97B9B0039062F /* ParseContext.cpp */,
                                31012DE518B97B9B0039062F /* ParseContext.h */,
                                31012DE618B97B9B0039062F /* PoolAlloc.cpp */,
                                31012DE718B97B9B0039062F /* PoolAlloc.h */,
                                31012DE818B97B9B0039062F /* Pragma.h */,
-                               31012DE918B97B9B0039062F /* QualifierAlive.cpp */,
                                31012DEA18B97B9B0039062F /* QualifierAlive.h */,
                                31012DED18B97B9B0039062F /* RenameFunction.h */,
                                31012DEE18B97B9B0039062F /* RewriteElseBlocks.cpp */,
                                31012DFF18B97B9B0039062F /* TranslatorHLSL.cpp */,
                                31012E0018B97B9B0039062F /* TranslatorHLSL.h */,
                                31012E0118B97B9B0039062F /* Types.h */,
-                               31012E0218B97B9B0039062F /* UnfoldShortCircuit.cpp */,
-                               31012E0318B97B9B0039062F /* UnfoldShortCircuit.h */,
                                31012E0418B97B9B0039062F /* UnfoldShortCircuitAST.cpp */,
                                31012E0518B97B9B0039062F /* UnfoldShortCircuitAST.h */,
                                31012E0818B97B9B0039062F /* util.cpp */,
                                5C1DBC791B0438D200235552 /* Query.h */,
                                5C1DBC7A1B0438D200235552 /* queryconversions.cpp */,
                                5C1DBC7B1B0438D200235552 /* queryconversions.h */,
-                               5C1DBC7C1B0438D200235552 /* RefCountObject.cpp */,
                                5C1DBC7D1B0438D200235552 /* RefCountObject.h */,
                                5C1DBC7E1B0438D200235552 /* Renderbuffer.cpp */,
                                5C1DBC7F1B0438D200235552 /* Renderbuffer.h */,
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               5C315D131CC5B6DA00776697 /* ValidateMaxParameters.h in Headers */,
+                               5C315D071CC5B6DA00776697 /* RemoveDynamicIndexing.h in Headers */,
                                31012E3C18B97B9B0039062F /* InitializeParseContext.h in Headers */,
                                A08C3CDD16D6CB61003F0B83 /* ArrayBoundsClamper.h in Headers */,
                                5CC7D46F19102621000B8C1F /* debug.h in Headers */,
                                31012E5518B97B9B0039062F /* ParseContext.h in Headers */,
                                5C1DBDEF1B0438D300235552 /* Fence.h in Headers */,
                                31012E2C18B97B9B0039062F /* ForLoopUnroll.h in Headers */,
+                               5C315D031CC5B6DA00776697 /* ExtensionGLSL.h in Headers */,
                                31012E6D18B97B9B0039062F /* TranslatorGLSL.h in Headers */,
                                5C1DBC3E1B04375F00235552 /* SeparateArrayInitialization.h in Headers */,
                                31012E4618B97B9B0039062F /* MMap.h in Headers */,
-                               5C1DBC431B04375F00235552 /* SimplifyArrayAssignment.h in Headers */,
                                5CC7D47319102621000B8C1F /* mathutil.h in Headers */,
                                31012E6B18B97B9B0039062F /* TranslatorESSL.h in Headers */,
                                5C1DBE001B0438D300235552 /* Program.h in Headers */,
                                31012E2018B97B9B0039062F /* DependencyGraphOutput.h in Headers */,
                                31012E7C18B97B9B0039062F /* VariableInfo.h in Headers */,
                                5C1DBDDB1B0438D300235552 /* Caps.h in Headers */,
+                               5C315D091CC5B6DA00776697 /* RemovePow.h in Headers */,
                                5C1DBE021B0438D300235552 /* Query.h in Headers */,
                                31012E6118B97B9B0039062F /* SearchSymbol.h in Headers */,
                                5C1DBF311B0438D300235552 /* Texture.h in Headers */,
                                5CC7D47119102621000B8C1F /* event_tracer.h in Headers */,
                                5C1DBDE71B0438D300235552 /* Device.h in Headers */,
                                5C1DBE061B0438D300235552 /* RefCountObject.h in Headers */,
+                               5C315D051CC5B6DA00776697 /* RecordConstantPrecision.h in Headers */,
                                31012E5D18B97B9B0039062F /* RenameFunction.h in Headers */,
                                5C1DBDFA1B0438D300235552 /* histogram_macros.h in Headers */,
                                5C1DBDD71B0438D300235552 /* BinaryStream.h in Headers */,
                                31012E3A18B97B9B0039062F /* InitializeGlobals.h in Headers */,
                                5C1DBC291B04375F00235552 /* BuiltInFunctionEmulatorGLSL.h in Headers */,
                                5C1DBBE61B04075B00235552 /* ShaderVars.h in Headers */,
+                               5C315D0B1CC5B6DA00776697 /* RewriteDoWhile.h in Headers */,
                                5C1DBC251B04375F00235552 /* blocklayout.h in Headers */,
                                5C1DBC271B04375F00235552 /* blocklayoutHLSL.h in Headers */,
                                31012E8018B97B9B0039062F /* VersionGLSL.h in Headers */,
                                5C1DBDD91B0438D300235552 /* Buffer.h in Headers */,
                                31012E2718B97B9B0039062F /* Diagnostics.h in Headers */,
                                5C1DBC361B04375F00235552 /* PruneEmptyDeclarations.h in Headers */,
+                               5C315D011CC5B6DA00776697 /* DeferGlobalInitializers.h in Headers */,
                                5C1DBDF61B0438D300235552 /* FramebufferAttachment.h in Headers */,
                                5CC7D46B19102620000B8C1F /* angleutils.h in Headers */,
                                31012E3218B97B9B0039062F /* glslang_tab.h in Headers */,
                                5CC7D458191024E4000B8C1F /* ValidateOutputs.h in Headers */,
                                31012E7418B97B9B0039062F /* UnfoldShortCircuitAST.h in Headers */,
                                5C1DBDF41B0438D300235552 /* Framebuffer.h in Headers */,
-                               31012E7218B97B9B0039062F /* UnfoldShortCircuit.h in Headers */,
                                A264F8B316974DED006FAA5A /* ExpressionParser.h in Headers */,
                                31012E3518B97B9B0039062F /* InfoSink.h in Headers */,
                                5C1DBF3A1B0438D300235552 /* validationES.h in Headers */,
                                31012E6718B97B9B0039062F /* RestrictFragmentShaderTiming.h in Headers */,
                                5CC7D47B19102621000B8C1F /* version.h in Headers */,
                                5C1DBF281B0438D300235552 /* Sampler.h in Headers */,
+                               5C315D111CC5B6DA00776697 /* ValidateGlobalInitializer.h in Headers */,
                                5C1DBF381B0438D300235552 /* validationEGL.h in Headers */,
                                5C1DBF3C1B0438D300235552 /* validationES2.h in Headers */,
                                31012E7818B97B9B0039062F /* util.h in Headers */,
                                A264F8CD169762AA006FAA5A /* khrplatform.h in Headers */,
                                5C1DBBF71B0436EC00235552 /* tls.h in Headers */,
                                5C1DBBF51B0436EC00235552 /* platform.h in Headers */,
+                               5C315D0F1CC5B6DA00776697 /* UnfoldShortCircuitToIf.h in Headers */,
                                5CC7D47A19102621000B8C1F /* utilities.h in Headers */,
                                31012E3918B97B9B0039062F /* InitializeDll.h in Headers */,
                                5C1DBBF21B0436EC00235552 /* MemoryBuffer.h in Headers */,
                                A264F8B716974DED006FAA5A /* Lexer.h in Headers */,
+                               5C315D0D1CC5B6DA00776697 /* SeparateExpressionsReturningArrays.h in Headers */,
                                A264F8B916974DED006FAA5A /* Macro.h in Headers */,
                                31012E5A18B97B9B0039062F /* QualifierAlive.h in Headers */,
                                31012E5718B97B9B0039062F /* PoolAlloc.h in Headers */,
                                31012E7A18B97B9B0039062F /* ValidateLimitations.h in Headers */,
                                5C1DBC341B04375F00235552 /* Operator.h in Headers */,
                                5C1DBC401B04375F00235552 /* SeparateDeclarations.h in Headers */,
+                               5C315CFF1CC5B6DA00776697 /* Cache.h in Headers */,
                                5C1DBDD61B0438D300235552 /* AttributeMap.h in Headers */,
                                31012E3318B97B9B0039062F /* HashNames.h in Headers */,
                                A264F8C216974DED006FAA5A /* Token.h in Headers */,
                                31012E2618B97B9B0039062F /* Diagnostics.cpp in Sources */,
                                31012E3D18B97B9B0039062F /* InitializeVariables.cpp in Sources */,
                                31012E7F18B97B9B0039062F /* VersionGLSL.cpp in Sources */,
+                               5C315D0A1CC5B6DA00776697 /* RewriteDoWhile.cpp in Sources */,
                                A08C3CDC16D6CB61003F0B83 /* ArrayBoundsClamper.cpp in Sources */,
                                5C1DBC451B04375F00235552 /* ValidateSwitch.cpp in Sources */,
                                5C1DBDF51B0438D300235552 /* FramebufferAttachment.cpp in Sources */,
                                5C1DBC441B04375F00235552 /* Types.cpp in Sources */,
                                72309A56183C27DE00370B93 /* Tokenizer.cpp in Sources */,
                                31012E6C18B97B9B0039062F /* TranslatorGLSL.cpp in Sources */,
+                               5C315D0E1CC5B6DA00776697 /* UnfoldShortCircuitToIf.cpp in Sources */,
                                5C1DBF411B0438D300235552 /* VertexAttribute.cpp in Sources */,
                                A264F8AC16974DED006FAA5A /* DiagnosticsBase.cpp in Sources */,
+                               5C315D101CC5B6DA00776697 /* ValidateGlobalInitializer.cpp in Sources */,
                                5C1DBDE41B0438D300235552 /* Data.cpp in Sources */,
                                5C1DBF291B0438D300235552 /* Shader.cpp in Sources */,
                                31012E1518B97B9B0039062F /* CodeGen.cpp in Sources */,
                                5CC7D47219102621000B8C1F /* mathutil.cpp in Sources */,
                                5C1DBE071B0438D300235552 /* Renderbuffer.cpp in Sources */,
                                31012E3B18B97B9B0039062F /* InitializeParseContext.cpp in Sources */,
-                               5C1DBE051B0438D300235552 /* RefCountObject.cpp in Sources */,
+                               5C315D021CC5B6DA00776697 /* ExtensionGLSL.cpp in Sources */,
                                5CC7D47019102621000B8C1F /* event_tracer.cpp in Sources */,
                                5C1DBF371B0438D300235552 /* validationEGL.cpp in Sources */,
                                31012E3118B97B9B0039062F /* glslang_tab.cpp in Sources */,
                                A264F8AE16974DED006FAA5A /* DirectiveHandlerBase.cpp in Sources */,
                                31012E4D18B97B9B0039062F /* OutputGLSL.cpp in Sources */,
                                31012E3018B97B9B0039062F /* glslang_lex.cpp in Sources */,
+                               5C315D001CC5B6DA00776697 /* DeferGlobalInitializers.cpp in Sources */,
                                5C1DBDE61B0438D300235552 /* Device.cpp in Sources */,
                                5C1DBDDF1B0438D300235552 /* Config.cpp in Sources */,
                                5C1DBDEA1B0438D300235552 /* Error.cpp in Sources */,
                                31012E6018B97B9B0039062F /* SearchSymbol.cpp in Sources */,
                                72309A58183C27F300370B93 /* ExpressionParser.cpp in Sources */,
                                31012E2818B97B9B0039062F /* DirectiveHandler.cpp in Sources */,
-                               31012E5918B97B9B0039062F /* QualifierAlive.cpp in Sources */,
-                               31012E7118B97B9B0039062F /* UnfoldShortCircuit.cpp in Sources */,
                                31012E6418B97B9B0039062F /* SymbolTable.cpp in Sources */,
                                5C1DBF351B0438D300235552 /* Uniform.cpp in Sources */,
                                5C1DBC261B04375F00235552 /* blocklayoutHLSL.cpp in Sources */,
+                               5C315D081CC5B6DA00776697 /* RemovePow.cpp in Sources */,
                                A264F8B416974DED006FAA5A /* Input.cpp in Sources */,
                                5C1DBC301B04375F00235552 /* IntermNode.cpp in Sources */,
                                5CC7D47919102621000B8C1F /* utilities.cpp in Sources */,
                                5C1DBC411B04375F00235552 /* ShaderVars.cpp in Sources */,
                                5C1DBF331B0438D300235552 /* TransformFeedback.cpp in Sources */,
                                31012E3418B97B9B0039062F /* InfoSink.cpp in Sources */,
-                               31012E5318B97B9B0039062F /* parseConst.cpp in Sources */,
                                5C1DBC201B04375F00235552 /* ArrayReturnValueToOutParameter.cpp in Sources */,
                                31012E5618B97B9B0039062F /* PoolAlloc.cpp in Sources */,
                                31012E6618B97B9B0039062F /* RestrictFragmentShaderTiming.cpp in Sources */,
                                31012E7718B97B9B0039062F /* util.cpp in Sources */,
                                5C1DBDE21B0438D300235552 /* Context.cpp in Sources */,
                                31012E5118B97B9B0039062F /* OutputHLSL.cpp in Sources */,
+                               5C315D0C1CC5B6DA00776697 /* SeparateExpressionsReturningArrays.cpp in Sources */,
                                31012E3618B97B9B0039062F /* Initialize.cpp in Sources */,
                                5C1DBE011B0438D300235552 /* Query.cpp in Sources */,
                                5C1DBF391B0438D300235552 /* validationES.cpp in Sources */,
                                5C1DBDFF1B0438D300235552 /* Program.cpp in Sources */,
+                               5C315D041CC5B6DA00776697 /* RecordConstantPrecision.cpp in Sources */,
                                31012E7B18B97B9B0039062F /* VariableInfo.cpp in Sources */,
                                5C1DBF2B1B0438D300235552 /* State.cpp in Sources */,
+                               5C315D061CC5B6DA00776697 /* RemoveDynamicIndexing.cpp in Sources */,
                                5C1DBBF61B0436EC00235552 /* tls.cpp in Sources */,
                                5CC7D452191024E4000B8C1F /* LoopInfo.cpp in Sources */,
                                5C1DBC3F1B04375F00235552 /* SeparateDeclarations.cpp in Sources */,
                                31012E7D18B97B9B0039062F /* VariablePacker.cpp in Sources */,
                                5C1DBDF31B0438D300235552 /* Framebuffer.cpp in Sources */,
                                31012E1F18B97B9B0039062F /* DependencyGraphOutput.cpp in Sources */,
+                               5C315D121CC5B6DA00776697 /* ValidateMaxParameters.cpp in Sources */,
                                5C1DBDD81B0438D300235552 /* Buffer.cpp in Sources */,
                                5C1DBDD31B0438D300235552 /* angletypes.cpp in Sources */,
                                5C1DBF251B0438D300235552 /* ResourceManager.cpp in Sources */,
                                31012E4B18B97B9B0039062F /* OutputESSL.cpp in Sources */,
                                A264F8BE16974DED006FAA5A /* Preprocessor.cpp in Sources */,
+                               5C315CFE1CC5B6DA00776697 /* Cache.cpp in Sources */,
                                5C1DBDEE1B0438D300235552 /* Fence.cpp in Sources */,
                                5CC7D457191024E4000B8C1F /* ValidateOutputs.cpp in Sources */,
                                5C1DBBF01B0436EC00235552 /* angleutils.cpp in Sources */,
-                               5C1DBC421B04375F00235552 /* SimplifyArrayAssignment.cpp in Sources */,
                                31012E2B18B97B9B0039062F /* ForLoopUnroll.cpp in Sources */,
                                5C1DBC3D1B04375F00235552 /* SeparateArrayInitialization.cpp in Sources */,
                                5C9FFF4E19102A000025B8FA /* FlagStd140Structs.cpp in Sources */,
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
                        buildSettings = {
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       ANGLE_ENABLE_OPENGL,
+                                       ANGLE_ENABLE_GLSL,
+                               );
                        };
                        name = Production;
                };
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
                        buildSettings = {
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       ANGLE_ENABLE_OPENGL,
+                                       ANGLE_ENABLE_GLSL,
+                               );
                        };
                        name = Debug;
                };
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 5D7C59C51208C68B001C873E /* ANGLE.xcconfig */;
                        buildSettings = {
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       ANGLE_ENABLE_OPENGL,
+                                       ANGLE_ENABLE_GLSL,
+                               );
                        };
                        name = Release;
                };
index 836bed8..3a6739f 100644 (file)
@@ -26,6 +26,7 @@ Microsoft Open Technologies, Inc.
 NVIDIA Corporation
 Opera Software ASA
 The Qt Company Ltd.
+Advanced Micro Devices, Inc.
 
 Jacek Caban
 Mark Callow
@@ -41,3 +42,5 @@ Aitor Moreno
 Yuri O'Donnell
 Josh Soref
 Maks Naumov
+Jinyoung Hur
+Sebastian Bergstein
index 58c1053..d2c0839 100644 (file)
@@ -1,25 +1,34 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2014-2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-gles_gypi = exec_script(
-  "//build/gypi_to_gn.py",
-  [ rebase_path("src/libGLESv2.gypi") ],
-  "scope",
-  [ "src/libGLESv2.gypi" ])
+# import the use_x11 variable
+import("//build/config/ui.gni")
+import("//third_party/angle/build/angle_common.gni")
 
-compiler_gypi = exec_script(
-  "//build/gypi_to_gn.py",
-  [ rebase_path("src/compiler.gypi") ],
-  "scope",
-  [ "src/compiler.gypi" ])
+angle_git_is_present = exec_script("src/commit_id.py",
+                                   [
+                                     "check",
+                                     rebase_path(".", root_build_dir),
+                                   ],
+                                   "value")
+
+angle_use_commit_id = angle_git_is_present == 1
+
+gles_gypi = exec_script("//build/gypi_to_gn.py",
+                        [ rebase_path("src/libGLESv2.gypi") ],
+                        "scope",
+                        [ "src/libGLESv2.gypi" ])
+
+compiler_gypi = exec_script("//build/gypi_to_gn.py",
+                            [ rebase_path("src/compiler.gypi") ],
+                            "scope",
+                            [ "src/compiler.gypi" ])
 
 # This config is exported to dependent targets (and also applied to internal
 # ones).
 config("external_config") {
-  include_dirs = [
-    "include",
-  ]
+  include_dirs = [ "include" ]
 }
 
 # This config is applied to internal Angle targets (not pushed to dependents).
@@ -30,27 +39,15 @@ config("internal_config") {
   ]
 }
 
-angle_enable_d3d9 = false
-angle_enable_d3d11 = false
-angle_enable_gl = false
-
 if (is_win) {
-  angle_enable_d3d9 = true
-  angle_enable_d3d11 = true
-  angle_enable_gl = true
-
-  import("//build/config/win/visual_studio_version.gni")
   copy("copy_compiler_dll") {
-    sources = [ "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll" ]
-    outputs = [ "$root_build_dir/d3dcompiler_47.dll" ]
+    sources = [
+      "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll",
+    ]
+    outputs = [
+      "$root_out_dir/d3dcompiler_47.dll",
+    ]
   }
-
-}  # is_win
-
-angle_enable_hlsl = false
-
-if (angle_enable_d3d9 || angle_enable_d3d11) {
-  angle_enable_hlsl = true
 }
 
 component("translator") {
@@ -61,11 +58,6 @@ component("translator") {
 
   defines = [ "ANGLE_TRANSLATOR_IMPLEMENTATION" ]
 
-  if (angle_enable_hlsl) {
-    sources += rebase_path(compiler_gypi.angle_translator_lib_hlsl_sources, ".", "src")
-    defines += [ "ANGLE_ENABLE_HLSL" ]
-  }
-
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":internal_config",
@@ -87,7 +79,8 @@ source_set("includes") {
     "include/GLES2/gl2ext.h",
     "include/GLES2/gl2platform.h",
     "include/GLES3/gl3.h",
-    "include/GLES3/gl3ext.h",
+    "include/GLES3/gl31.h",
+    "include/GLES3/gl32.h",
     "include/GLES3/gl3platform.h",
     "include/GLSLANG/ShaderLang.h",
     "include/KHR/khrplatform.h",
@@ -108,20 +101,45 @@ config("translator_static_config") {
   defines = [ "ANGLE_TRANSLATOR_STATIC" ]
 }
 
+config("debug_annotations_config") {
+  if (is_debug) {
+    defines = [ "ANGLE_ENABLE_DEBUG_ANNOTATIONS" ]
+  }
+}
+
 static_library("angle_common") {
   sources = rebase_path(gles_gypi.libangle_common_sources, ".", "src")
+
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":internal_config",
+    ":debug_annotations_config",
+    "//build/config/compiler:no_chromium_code",
   ]
+
+  public_deps = [ ":commit_id" ]
 }
 
 static_library("translator_lib") {
   sources = rebase_path(compiler_gypi.angle_translator_lib_sources, ".", "src")
+  defines = []
+
+  if (angle_enable_essl) {
+    sources +=
+        rebase_path(compiler_gypi.angle_translator_lib_essl_sources, ".", "src")
+    defines += [ "ANGLE_ENABLE_ESSL" ]
+  }
+
+  if (angle_enable_glsl) {
+    sources +=
+        rebase_path(compiler_gypi.angle_translator_lib_glsl_sources, ".", "src")
+    defines += [ "ANGLE_ENABLE_GLSL" ]
+  }
 
   if (angle_enable_hlsl) {
-    sources += rebase_path(compiler_gypi.angle_translator_lib_hlsl_sources, ".", "src")
-    defines = [ "ANGLE_ENABLE_HLSL" ]
+    sources +=
+        rebase_path(compiler_gypi.angle_translator_lib_hlsl_sources, ".", "src")
+    defines += [ "ANGLE_ENABLE_HLSL" ]
   }
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
@@ -167,19 +185,32 @@ config("commit_id_config") {
   include_dirs = [ "$root_gen_dir/angle" ]
 }
 
-action("commit_id") {
-  script = "src/commit_id.py"
-
-  output_file = "$root_gen_dir/angle/id/commit.h"
-  outputs = [ output_file ]
+commit_id_output_file = "$root_gen_dir/angle/id/commit.h"
+if (angle_use_commit_id) {
+  action("commit_id") {
+    script = "src/commit_id.py"
+    outputs = [
+      commit_id_output_file,
+    ]
 
-  args = [
-    "gen",
-    rebase_path(".", root_build_dir),
-    rebase_path(output_file, root_build_dir),
-  ]
+    args = [
+      "gen",
+      rebase_path(".", root_build_dir),
+      rebase_path(commit_id_output_file, root_build_dir),
+    ]
 
-  public_configs = [ ":commit_id_config" ]
+    public_configs = [ ":commit_id_config" ]
+  }
+} else {
+  copy("commit_id") {
+    sources = [
+      "src/commit.h",
+    ]
+    outputs = [
+      commit_id_output_file,
+    ]
+    public_configs = [ ":commit_id_config" ]
+  }
 }
 
 config("libANGLE_config") {
@@ -194,11 +225,25 @@ config("libANGLE_config") {
   if (angle_enable_gl) {
     defines += [ "ANGLE_ENABLE_OPENGL" ]
   }
+  if (use_x11) {
+    defines += [ "ANGLE_USE_X11" ]
+  }
   defines += [
-    "GL_APICALL=",
-    "GL_GLEXT_PROTOTYPES=",
-    "EGLAPI=",
+    "GL_GLEXT_PROTOTYPES",
+    "EGL_EGLEXT_PROTOTYPES",
   ]
+
+  if (is_win) {
+    defines += [
+      "GL_APICALL=",
+      "EGLAPI=",
+    ]
+  } else {
+    defines += [
+      "GL_APICALL=__attribute__((visibility(\"default\")))",
+      "EGLAPI=__attribute__((visibility(\"default\")))",
+    ]
+  }
   if (is_win) {
     cflags += [ "/wd4530" ]  # C++ exception handler used, but unwind semantics are not enabled.
   }
@@ -209,18 +254,20 @@ static_library("libANGLE") {
 
   include_dirs = []
   libs = []
-  defines = [
-    "LIBANGLE_IMPLEMENTATION",
+  defines = [ "LIBANGLE_IMPLEMENTATION" ]
+
+  deps = [
+    ":angle_common",
+    ":commit_id",
+    ":includes",
+    ":translator_static",
   ]
 
   # Shared D3D sources.
   if (angle_enable_d3d9 || angle_enable_d3d11) {
     sources += rebase_path(gles_gypi.libangle_d3d_shared_sources, ".", "src")
 
-    defines += [
-      "ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " +
-        "\"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }",
-    ]
+    defines += [ "ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " + "\"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" ]
   }
 
   if (angle_enable_d3d9) {
@@ -241,30 +288,32 @@ static_library("libANGLE") {
     if (is_win) {
       sources += rebase_path(gles_gypi.libangle_gl_wgl_sources, ".", "src")
     }
+    if (use_x11) {
+      sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
+      deps += [
+        "src/third_party/libXNVCtrl:libXNVCtrl"
+      ]
+      libs += [
+        "X11",
+        "Xi",
+        "Xext",
+      ]
+    }
   }
 
   if (is_debug) {
-    defines += [
-      "ANGLE_GENERATE_SHADER_DEBUG_INFO",
-      "ANGLE_ENABLE_DEBUG_ANNOTATIONS",
-    ]
+    defines += [ "ANGLE_GENERATE_SHADER_DEBUG_INFO" ]
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":commit_id_config",
+    ":debug_annotations_config",
     ":libANGLE_config",
     ":internal_config",
     "//build/config/compiler:no_chromium_code",
   ]
 
-  deps = [
-    ":commit_id",
-    ":includes",
-    ":translator_static",
-    ":angle_common",
-  ]
-
   if (is_win) {
     deps += [ ":copy_compiler_dll" ]
   }
@@ -274,21 +323,20 @@ shared_library("libGLESv2") {
   sources = rebase_path(gles_gypi.libglesv2_sources, ".", "src")
 
   if (is_win) {
-    ldflags = [ "/DEF:" +
-                rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
+    ldflags =
+        [ "/DEF:" + rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":internal_config",
     ":commit_id_config",
+    ":debug_annotations_config",
     ":libANGLE_config",
     "//build/config/compiler:no_chromium_code",
   ]
 
-  defines = [
-    "LIBGLESV2_IMPLEMENTATION",
-  ]
+  defines = [ "LIBGLESV2_IMPLEMENTATION" ]
 
   deps = [
     ":includes",
@@ -300,24 +348,73 @@ shared_library("libEGL") {
   sources = rebase_path(gles_gypi.libegl_sources, ".", "src")
 
   if (is_win) {
-    ldflags = [ "/DEF:" +
-                rebase_path("src/libEGL/libEGL.def", root_build_dir) ]
+    ldflags = [ "/DEF:" + rebase_path("src/libEGL/libEGL.def", root_build_dir) ]
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":internal_config",
     ":commit_id_config",
+    ":debug_annotations_config",
     ":libANGLE_config",
     "//build/config/compiler:no_chromium_code",
   ]
 
+  defines = [ "LIBEGL_IMPLEMENTATION" ]
+
+  deps = [
+    ":includes",
+    ":libGLESv2",
+  ]
+}
+
+util_gypi = exec_script("//build/gypi_to_gn.py",
+                        [ rebase_path("util/util.gyp") ],
+                        "scope",
+                        [ "util/util.gyp" ])
+
+config("angle_util_config") {
+  include_dirs = [ "util" ]
+  if (is_linux) {
+    libs = [ "X11" ]
+  }
+}
+
+static_library("angle_util") {
+  sources = rebase_path(util_gypi.util_sources, ".", "util")
+
+  if (is_win) {
+    sources += rebase_path(util_gypi.util_win32_sources, ".", "util")
+  }
+
+  if (is_linux) {
+    sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
+    libs = [ "rt" ]
+  }
+
+  if (is_mac) {
+    sources += rebase_path(util_gypi.util_osx_sources, ".", "util")
+  }
+
+  if (use_x11) {
+    sources += rebase_path(util_gypi.util_x11_sources, ".", "util")
+  }
+
   defines = [
-    "LIBEGL_IMPLEMENTATION",
+    "GL_GLEXT_PROTOTYPES",
+    "EGL_EGLEXT_PROTOTYPES",
+  ]
+
+  configs += [ ":debug_annotations_config" ]
+
+  public_configs = [
+    ":angle_util_config",
+    ":internal_config",
   ]
 
   deps = [
-    ":includes",
+    ":angle_common",
+    ":libEGL",
     ":libGLESv2",
   ]
 }
index cbcc912..a745e14 100644 (file)
@@ -74,7 +74,6 @@ add_library(libANGLE STATIC
     src/compiler/translator/SearchSymbol.cpp
     src/compiler/translator/TranslatorESSL.cpp
     src/compiler/translator/TranslatorGLSL.cpp
-    src/compiler/translator/UnfoldShortCircuit.cpp
     src/compiler/translator/VersionGLSL.cpp
     src/compiler/translator/ASTMetadataHLSL.cpp
     src/compiler/translator/blocklayoutHLSL.cpp
@@ -89,9 +88,11 @@ add_library(libANGLE STATIC
     src/compiler/translator/ArrayReturnValueToOutParameter.cpp
     src/compiler/translator/blocklayout.cpp
     src/compiler/translator/BuiltInFunctionEmulator.cpp
+    src/compiler/translator/Cache.cpp
     src/compiler/translator/CallDAG.cpp
     src/compiler/translator/CodeGen.cpp
     src/compiler/translator/Compiler.cpp
+    src/compiler/translator/DeferGlobalInitializers.cpp
     src/compiler/translator/Diagnostics.cpp
     src/compiler/translator/DirectiveHandler.cpp
     src/compiler/translator/EmulatePrecision.cpp
@@ -108,27 +109,31 @@ add_library(libANGLE STATIC
     src/compiler/translator/IntermTraverse.cpp
     src/compiler/translator/LoopInfo.cpp
     src/compiler/translator/Operator.cpp
-    src/compiler/translator/parseConst.cpp
     src/compiler/translator/ParseContext.cpp
     src/compiler/translator/PoolAlloc.cpp
     src/compiler/translator/PruneEmptyDeclarations.cpp
-    src/compiler/translator/QualifierAlive.cpp
     src/compiler/translator/RegenerateStructNames.cpp
+    src/compiler/translator/RemoveDynamicIndexing.cpp
+    src/compiler/translator/RemovePow.cpp
     src/compiler/translator/RemoveSwitchFallThrough.cpp
+    src/compiler/translator/RewriteDoWhile.cpp
     src/compiler/translator/RewriteElseBlocks.cpp
     src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
     src/compiler/translator/SearchSymbol.cpp
     src/compiler/translator/SeparateArrayInitialization.cpp
     src/compiler/translator/SeparateDeclarations.cpp
+    src/compiler/translator/SeparateExpressionsReturningArrays.cpp
     src/compiler/translator/ShaderLang.cpp
     src/compiler/translator/ShaderVars.cpp
-    src/compiler/translator/SimplifyArrayAssignment.cpp
     src/compiler/translator/SymbolTable.cpp
     src/compiler/translator/Types.cpp
     src/compiler/translator/UnfoldShortCircuit.cpp
     src/compiler/translator/UnfoldShortCircuitAST.cpp
+    src/compiler/translator/UnfoldShortCircuitToIf.cpp
     src/compiler/translator/util.cpp
+    src/compiler/translator/ValidateGlobalInitializer.cpp
     src/compiler/translator/ValidateLimitations.cpp
+    src/compiler/translator/ValidateMaxParameters.cpp
     src/compiler/translator/ValidateOutputs.cpp
     src/compiler/translator/ValidateSwitch.cpp
     src/compiler/translator/VariableInfo.cpp
@@ -150,6 +155,7 @@ add_library(libANGLE STATIC
     src/libANGLE/Config.cpp
     src/libANGLE/Context.cpp
     src/libANGLE/Data.cpp
+    src/libANGLE/Debug.cpp
     src/libANGLE/Device.cpp
     src/libANGLE/Display.cpp
     src/libANGLE/Error.cpp
@@ -159,6 +165,8 @@ add_library(libANGLE STATIC
     src/libANGLE/Framebuffer.cpp
     src/libANGLE/FramebufferAttachment.cpp
     src/libANGLE/HandleAllocator.cpp
+    src/libANGLE/IndexRangeCache.cpp
+    src/libANGLE/Image.cpp
     src/libANGLE/ImageIndex.cpp
     src/libANGLE/Platform.cpp
     src/libANGLE/Program.cpp
@@ -166,8 +174,10 @@ add_library(libANGLE STATIC
     src/libANGLE/queryconversions.cpp
     src/libANGLE/RefCountObject.cpp
     src/libANGLE/Renderbuffer.cpp
+    src/libANGLE/Stream.cpp
     src/libANGLE/renderer/d3d/BufferD3D.cpp
     src/libANGLE/renderer/d3d/CompilerD3D.cpp
+    src/libANGLE/renderer/d3d/EGLImageD3D.cpp
     src/libANGLE/renderer/d3d/copyimage.cpp
     src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
     src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
@@ -185,11 +195,18 @@ add_library(libANGLE STATIC
     src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
     src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
     src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
+    src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
+    src/libANGLE/renderer/d3d/d3d11/Stream11.cpp
     src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
     src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
     src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
     src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
+    src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
     src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
+    src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
+    src/libANGLE/renderer/d3d/d3d11/loadimage_etc.cpp
+    src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp
+    src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
     src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
     src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
     src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
@@ -204,6 +221,7 @@ add_library(libANGLE STATIC
     src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
     src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
     src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
+    src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
     src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
     src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
     src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
@@ -227,15 +245,12 @@ add_library(libANGLE STATIC
     src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
     src/libANGLE/renderer/d3d/SurfaceD3D.cpp
     src/libANGLE/renderer/d3d/TextureD3D.cpp
-    src/libANGLE/renderer/d3d/TextureStorage.cpp
     src/libANGLE/renderer/d3d/TransformFeedbackD3D.cpp
+    src/libANGLE/renderer/d3d/VaryingPacking.cpp
     src/libANGLE/renderer/d3d/VertexBuffer.cpp
     src/libANGLE/renderer/d3d/VertexDataManager.cpp
     src/libANGLE/renderer/DeviceImpl.cpp
     src/libANGLE/renderer/DisplayImpl.cpp
-    src/libANGLE/renderer/IndexRangeCache.cpp
-    src/libANGLE/renderer/ProgramImpl.cpp
-    src/libANGLE/renderer/RenderbufferImpl.cpp
     src/libANGLE/renderer/Renderer.cpp
     src/libANGLE/renderer/SurfaceImpl.cpp
     src/libANGLE/ResourceManager.cpp
index faba0af..bd394b5 100644 (file)
-# This is the official list of people who can contribute\r
-# (and who have contributed) code to the ANGLE project\r
-# repository.\r
-# The AUTHORS file lists the copyright holders; this file\r
-# lists people.  For example, Google employees are listed here\r
-# but not in AUTHORS, because Google holds the copyright.\r
-#\r
-\r
-TransGaming Inc.\r
- Nicolas Capens\r
- Daniel Koch\r
- Geoff Lang\r
- Andrew Lewycky\r
- Jamie Madill\r
- Gavriel State\r
- Shannon Woods\r
-\r
-Google Inc.\r
- Brent Austin\r
- Michael Bai\r
- John Bauman\r
- Peter Beverloo\r
- Steve Block\r
- Rachel Blum\r
- Eric Boren\r
- Henry Bridge\r
- Nat Duca\r
- Peter Kasting\r
- Vangelis Kokkevis\r
- Zhenyao Mo\r
- Daniel Nicoara\r
- Alastair Patrick\r
- Alok Priyadarshi\r
- Kenneth Russell\r
- Brian Salomon\r
- Gregg Tavares\r
- Jeff Timanus\r
- Ben Vanik\r
- Adrienne Walker\r
- thestig@chromium.org\r
- Justin Schuh\r
- Scott Graham\r
- Corentin Wallez\r
-\r
-Adobe Systems Inc.\r
- Alexandru Chiculita\r
- Steve Minns\r
- Max Vujovic\r
-\r
-Autodesk, Inc.\r
- Ranger Harke\r
-\r
-Cloud Party, Inc.\r
- Conor Dickinson\r
-\r
-The Qt Company Ltd.\r
- Andrew Knight\r
-\r
-Imagination Technologies Ltd.\r
- Gregoire Payen de La Garanderie\r
-\r
-Intel Corporation\r
- Jin Yang\r
- Andy Chen\r
- Josh Triplett\r
- Sudarsana Nagineni\r
-\r
-Klarälvdalens Datakonsult AB\r
- Milian Wolff\r
-\r
-Mozilla Corp.\r
- Ehsan Akhgari\r
- Jeff Gilbert\r
- Mike Hommey\r
- Benoit Jacob\r
- Makoto Kato\r
- Vladimir Vukicevic\r
-\r
-Turbulenz\r
- Michael Braithwaite\r
-\r
-Ulrik Persson (ddefrostt)\r
-Mark Banner (standard8mbp)\r
-David Kilzer\r
-Jacek Caban\r
-Tibor den Ouden\r
-Régis Fénéon\r
-\r
-Microsoft Corporation\r
- Cooper Partin\r
- Austin Kinross\r
- Minmin Gong\r
-\r
-Microsoft Open Technologies, Inc.\r
- Cooper Partin\r
- Austin Kinross\r
-\r
-NVIDIA Corporation\r
- Olli Etuaho\r
- Arun Patole\r
- Qingqing Deng\r
-\r
-Opera Software ASA\r
- Daniel Bratell\r
+# This is the official list of people who can contribute
+# (and who have contributed) code to the ANGLE project
+# repository.
+# The AUTHORS file lists the copyright holders; this file
+# lists people.  For example, Google employees are listed here
+# but not in AUTHORS, because Google holds the copyright.
+#
+
+TransGaming Inc.
+ Nicolas Capens
+ Daniel Koch
+ Geoff Lang
+ Andrew Lewycky
+ Jamie Madill
+ Gavriel State
+ Shannon Woods
+
+Google Inc.
+ Brent Austin
+ Michael Bai
+ John Bauman
+ Peter Beverloo
+ Steve Block
+ Rachel Blum
+ Eric Boren
+ Henry Bridge
+ Nat Duca
+ Peter Kasting
+ Vangelis Kokkevis
+ Zhenyao Mo
+ Daniel Nicoara
+ Alastair Patrick
+ Alok Priyadarshi
+ Kenneth Russell
+ Brian Salomon
+ Gregg Tavares
+ Jeff Timanus
+ Ben Vanik
+ Adrienne Walker
+ thestig@chromium.org
+ Justin Schuh
+ Scott Graham
+ Corentin Wallez
+
+Adobe Systems Inc.
+ Alexandru Chiculita
+ Steve Minns
+ Max Vujovic
+
+Autodesk, Inc.
+ Ranger Harke
+
+Cloud Party, Inc.
+ Conor Dickinson
+
+The Qt Company Ltd.
+ Andrew Knight
+
+Imagination Technologies Ltd.
+ Gregoire Payen de La Garanderie
+
+Intel Corporation
+ Jin Yang
+ Andy Chen
+ Josh Triplett
+ Sudarsana Nagineni
+
+Klarälvdalens Datakonsult AB
+ Milian Wolff
+
+Mozilla Corp.
+ Ehsan Akhgari
+ Jeff Gilbert
+ Mike Hommey
+ Benoit Jacob
+ Makoto Kato
+ Vladimir Vukicevic
+
+Turbulenz
+ Michael Braithwaite
+
+Ulrik Persson (ddefrostt)
+Mark Banner (standard8mbp)
+David Kilzer
+Jacek Caban
+Tibor den Ouden
+Régis Fénéon
+Sebastian Bergstein
+
+Microsoft Corporation
+ Cooper Partin
+ Austin Kinross
+ Minmin Gong
+ Shawn Hargreaves
+
+Microsoft Open Technologies, Inc.
+ Cooper Partin
+ Austin Kinross
+
+NVIDIA Corporation
+ Olli Etuaho
+ Arun Patole
+ Qingqing Deng
+ Kimmo Kinnunen
+
+Opera Software ASA
+ Daniel Bratell
+ Tomasz Moniuszko
+
+Advanced Micro Devices, Inc.
+ Russ Lind
index fd209e9..161558c 100644 (file)
@@ -1,3 +1,12 @@
+2016-04-19  Alex Christensen  <achristensen@webkit.org>
+
+        Update ANGLE
+        https://bugs.webkit.org/show_bug.cgi?id=156755
+
+        Reviewed by Dean Jackson.
+
+        Huge list of changed files omitted.
+
 2016-04-12  Alex Christensen  <achristensen@webkit.org>
 
         Remove failing assertion in ANGLE
index ffad7b8..056d764 100644 (file)
+vars = {
+  'chromium_git': 'https://chromium.googlesource.com',
+}
+
 deps = {
   "third_party/gyp":
-      "http://gyp.googlecode.com/svn/trunk@1987",
+      Var('chromium_git') + "/external/gyp@81c2e5ff92af29bab61c982808076ddce3d200a2",
 
   # TODO(kbr): figure out how to better stay in sync with Chromium's
   # versions of googletest and googlemock.
   "src/tests/third_party/googletest":
-      "http://googletest.googlecode.com/svn/trunk@629",
+      Var('chromium_git') + "/external/googletest.git@9855a87157778d39b95eccfb201a9dc90f6d61c6",
 
   "src/tests/third_party/googlemock":
-      "http://googlemock.googlecode.com/svn/trunk@410",
+      Var('chromium_git') + "/external/googlemock.git@b2cb211e49d872101d991201362d7b97d7d69910",
 
-  "src/tests/third_party/deqp":
-      "https://android.googlesource.com/platform/external/deqp@c7661bcd3bcec04b1abf6c3b290c4150db565604",
+  # Cherry is a dEQP management GUI written in Go. We use it for viewing test results.
+  "third_party/cherry":
+      "https://android.googlesource.com/platform/external/cherry@af6c09fe05115f0cca61ae23ee871bda27cf1ff5",
 
-  "src/tests/third_party/libpng":
+  "third_party/deqp/src":
+      "https://android.googlesource.com/platform/external/deqp@cc0ded6c77267bbb14d21aac358fc5d9690c07f8",
+
+  "third_party/libpng":
       "https://android.googlesource.com/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c",
 
-  "src/tests/third_party/zlib":
-      "https://chromium.googlesource.com/chromium/src/third_party/zlib@afd8c4593c010c045902f6c0501718f1823064a3",
+  "third_party/zlib":
+      Var('chromium_git') + "/chromium/src/third_party/zlib@afd8c4593c010c045902f6c0501718f1823064a3",
+
+  "buildtools":
+      Var('chromium_git') + '/chromium/buildtools.git@125d157607de4d7c95bf8b02dd580aae17962f19',
 }
 
 hooks = [
+  # Pull clang-format binaries using checked-in hashes.
+  {
+    'name': 'clang_format_win',
+    'pattern': '.',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=win32',
+                '--no_auth',
+                '--bucket', 'chromium-clang-format',
+                '-s', 'buildtools/win/clang-format.exe.sha1',
+    ],
+  },
+  {
+    'name': 'clang_format_mac',
+    'pattern': '.',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=darwin',
+                '--no_auth',
+                '--bucket', 'chromium-clang-format',
+                '-s', 'buildtools/mac/clang-format.sha1',
+    ],
+  },
+  {
+    'name': 'clang_format_linux',
+    'pattern': '.',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=linux*',
+                '--no_auth',
+                '--bucket', 'chromium-clang-format',
+                '-s', 'buildtools/linux64/clang-format.sha1',
+    ],
+  },
+  # Pull GN binaries using checked-in hashes.
+  {
+    'name': 'gn_win',
+    'pattern': '.',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=win32',
+                '--no_auth',
+                '--bucket', 'chromium-gn',
+                '-s', 'buildtools/win/gn.exe.sha1',
+    ],
+  },
+  {
+    'name': 'gn_mac',
+    'pattern': '.',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=darwin',
+                '--no_auth',
+                '--bucket', 'chromium-gn',
+                '-s', 'buildtools/mac/gn.sha1',
+    ],
+  },
+  {
+    'name': 'gn_linux64',
+    'pattern': '.',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=linux*',
+                '--no_auth',
+                '--bucket', 'chromium-gn',
+                '-s', 'buildtools/linux64/gn.sha1',
+    ],
+  },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
index e20ae05..632b416 100644 (file)
@@ -1,22 +1,44 @@
 #ANGLE
-The goal of ANGLE is to allow Windows users to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to DirectX 9 or DirectX 11 API calls.
+The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 to desktop OpenGL, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES 3.0 to all of these APIs is nearing completion, and future plans include enabling validated ES-to-ES support.
 
-ANGLE is a conformant implementation of the OpenGL ES 2.0 specification that is hardware‐accelerated via Direct3D. ANGLE v1.0.772 was certified compliant by passing the ES 2.0.3 conformance tests in October 2011. ANGLE also provides an implementation of the EGL 1.4 specification. Work on ANGLE's OpenGL ES 3.0 implementation is currently in progress, but should not be considered stable.
+|                |  Direct3D 9   |    Direct3D 11      |    Desktop GL      |    GL ES  |
+|----------------|:-------------:|:-------------------:|:------------------:|:---------:|
+| OpenGL ES 2.0  |    complete   |      complete       |     complete       |   planned |
+| OpenGL ES 3.0  |               |  nearing completion | nearing completion |   planned |
+[Level of OpenGL ES support via backing renderers]
+
+
+|             |    Direct3D 9  |   Direct3D 11  |   Desktop GL  |
+|------------:|:--------------:|:--------------:|:-------------:|
+| Windows     |        *       |        *       |       *       |
+| Linux       |                |                |       *       |
+| Mac OS X    |                |                |   in progress |
+[Platform support via backing renderers]
+
+ANGLE v1.0.772 was certified compliant by passing the ES 2.0.3 conformance tests in October 2011. ANGLE also provides an implementation of the EGL 1.4 specification.
 
 ANGLE is used as the default WebGL backend for both Google Chrome and Mozilla Firefox on Windows platforms. Chrome uses ANGLE for all graphics rendering on Windows, including the accelerated Canvas2D implementation and the Native Client sandbox environment.
 
 Portions of the ANGLE shader compiler are used as a shader validator and translator by WebGL implementations across multiple platforms. It is used on Mac OS X, Linux, and in mobile variants of the browsers. Having one shader validator helps to ensure that a consistent set of GLSL ES shaders are accepted across browsers and platforms. The shader translator can be used to translate shaders to other shading languages, and to optionally apply shader modifications to work around bugs or quirks in the native graphics drivers. The translator targets Desktop GLSL, Direct3D HLSL, and even ESSL for native GLES2 platforms.
 
+##Browsing
+Browse ANGLE's source in the [repository](https://chromium.googlesource.com/angle/angle)
+
 ##Building
-For building instructions, visit the [dev setup wiki](https://code.google.com/p/angleproject/wiki/DevSetup).
+View the [Dev setup instructions](doc/DevSetup.md). For generating a Windows Store version of ANGLE view the [Windows Store instructions](doc/BuildingAngleForWindowsStore.md)
 
 ##Contributing
 * Join our [Google group](https://groups.google.com/group/angleproject) to keep up to date.
 * Join us on IRC in the #ANGLEproject channel on FreeNode.
-* Read about ANGLE development on the [wiki](http://code.google.com/p/angleproject/w/list).
-* Become a [code contributor](https://code.google.com/p/angleproject/wiki/ContributingCode).
+* Read about ANGLE development in our [documentation](doc).
+* Become a [code contributor](doc/ContributingCode.md).
+* Refer to ANGLE's [coding standard](doc/CodingStandard.md).
+* Learn how to [build ANGLE for Chromium development](doc/BuildingAngleForChromiumDevelopment.md).
+* [Choose an ANGLE branch](doc/ChoosingANGLEBranch.md) to track in your own project.
 * File bugs in the [issue tracker](http://code.google.com/p/angleproject/issues/list) (preferably with an isolated test-case).
 * Read about WebGL on the [Khronos WebGL Wiki](http://khronos.org/webgl/wiki/Main_Page).
-* Learn about implementation details in the [OpenGL Insights chapter on ANGLE](http://www.seas.upenn.edu/~pcozzi/OpenGLInsights/OpenGLInsights-ANGLE.pdf) and this [ANGLE presentation](https://code.google.com/p/angleproject/downloads/detail?name=ANGLE%20and%20Cross-Platform%20WebGL%20Support.pdf&can=2&q=).
+* Learn about implementation details in the [OpenGL Insights chapter on ANGLE](http://www.seas.upenn.edu/~pcozzi/OpenGLInsights/OpenGLInsights-ANGLE.pdf) and this [ANGLE presentation](https://drive.google.com/file/d/0Bw29oYeC09QbbHoxNE5EUFh0RGs/view?usp=sharing).
 * Learn about the past, present, and future of the ANGLE implementation in [this recent presentation](https://docs.google.com/presentation/d/1CucIsdGVDmdTWRUbg68IxLE5jXwCb2y1E9YVhQo0thg/pub?start=false&loop=false).
-* If you use ANGLE in your own project, we'd love to hear about it!
\ No newline at end of file
+* Notes on [debugging ANGLE](doc/DebuggingTips.md).
+* If you use ANGLE in your own project, we'd love to hear about it!
+
index 6ba2752..a0e8e26 100644 (file)
@@ -1,6 +1,9 @@
 # Copyright 2015 The ANGLE Project Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
+# This isolate expresses the Chromium project's default runtime
+# dependencies.
 {
   'conditions': [
     ['OS=="win"', {
index 94227bd..4328a00 100644 (file)
@@ -1,5 +1,5 @@
 diff --git a/include/GLSLANG/ShaderLang.h b/include/GLSLANG/ShaderLang.h
-index e750e32..7d3f415 100644
+index 78f8ef6..b7fdf55 100644
 --- a/include/GLSLANG/ShaderLang.h
 +++ b/include/GLSLANG/ShaderLang.h
 @@ -25,7 +25,7 @@
@@ -11,21 +11,17 @@ index e750e32..7d3f415 100644
  
  #include <map>
  #include <string>
-diff --git a/src/common/mathutil.h b/src/common/mathutil.h
-index 9f5c9fd..7959da8 100644
---- a/src/common/mathutil.h
-+++ b/src/common/mathutil.h
-@@ -478,7 +478,7 @@ inline unsigned int average(unsigned int a, unsigned int b)
- inline signed int average(signed int a, signed int b)
- {
--    return ((long long)a + (long long)b) / 2;
-+    return (signed int)((long long)a + (long long)b) / 2;
- }
- inline float average(float a, float b)
+@@ -343,7 +343,7 @@ COMPILER_EXPORT const std::string &ShGetBuiltInResourcesString(const ShHandle ha
+ // type: Specifies the type of shader - GL_FRAGMENT_SHADER or GL_VERTEX_SHADER.
+ // spec: Specifies the language spec the compiler must conform to -
+ //       SH_GLES2_SPEC or SH_WEBGL_SPEC.
+-// output: Specifies the output code type - for example SH_ESSL_OUTPUT, SH_GLSL_OUTPUT,
++// output: Specifies the output code type - for example SH_ESSL_OUTPUT, SH_GLSL_COMPATIBILITY_OUTPUT,
+ //         SH_HLSL_3_0_OUTPUT or SH_HLSL_4_1_OUTPUT. Note: Each output type may only
+ //         be supported in some configurations.
+ // resources: Specifies the built-in resources.
 diff --git a/src/common/version.h b/src/common/version.h
-index 758c78d..2a44709 100644
+index e7ffa7c..b653ae3 100644
 --- a/src/common/version.h
 +++ b/src/common/version.h
 @@ -7,7 +7,7 @@
@@ -38,524 +34,142 @@ index 758c78d..2a44709 100644
  #define ANGLE_MAJOR_VERSION 2
  #define ANGLE_MINOR_VERSION 1
 diff --git a/src/compiler/preprocessor/ExpressionParser.cpp b/src/compiler/preprocessor/ExpressionParser.cpp
-index 683195c..851183e 100644
+index 193b150..b38b7ae 100644
 --- a/src/compiler/preprocessor/ExpressionParser.cpp
 +++ b/src/compiler/preprocessor/ExpressionParser.cpp
 @@ -1,5 +1,7 @@
  /* A Bison parser, made by GNU Bison 3.0.4.  */
  
-+/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */ 
++/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
 +
  /* Bison implementation for Yacc-like parsers in C
  
     Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 diff --git a/src/compiler/preprocessor/Tokenizer.cpp b/src/compiler/preprocessor/Tokenizer.cpp
-index 75df434..dd9d41a 100644
+index eb6156f..1caee47 100644
 --- a/src/compiler/preprocessor/Tokenizer.cpp
 +++ b/src/compiler/preprocessor/Tokenizer.cpp
-@@ -6,6 +6,11 @@
- //
- // This file is auto-generated by generate_parser.sh. DO NOT EDIT!
-+// This file was edited anyways to ignore clang warnings.
-+#if defined(__clang__)
-+#pragma clang diagnostic push
-+#pragma GCC diagnostic ignored "-Wunneeded-internal-declaration"
-+#endif
-diff --git a/src/compiler/translator/CallDAG.cpp b/src/compiler/translator/CallDAG.cpp
-index 1d1eb8b..95dbea1 100644
---- a/src/compiler/translator/CallDAG.cpp
-+++ b/src/compiler/translator/CallDAG.cpp
-@@ -71,10 +71,10 @@ class CallDAG::CallDAGCreator : public TIntermTraverser
-             record.callees.reserve(data.callees.size());
-             for (auto &callee : data.callees)
-             {
--                record.callees.push_back(callee->index);
-+                record.callees.push_back(static_cast<int>(callee->index));
-             }
--            (*idToIndex)[data.node->getFunctionId()] = data.index;
-+            (*idToIndex)[data.node->getFunctionId()] = static_cast<int>(data.index);
-         }
-     }
-diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
-index 8b5b12f..5c029ba 100644
---- a/src/compiler/translator/Compiler.cpp
-+++ b/src/compiler/translator/Compiler.cpp
-@@ -528,15 +528,15 @@ bool TCompiler::checkCallDepth()
-             infoSink.info << "Call stack too deep (larger than " << maxCallStackDepth
-                           << ") with the following call chain: " << record.name;
--            int currentFunction = i;
-+            signed long long currentFunction = i;
-             int currentDepth = depth;
-             while (currentFunction != -1)
-             {
--                infoSink.info << " -> " << mCallDag.getRecordFromIndex(currentFunction).name;
-+                infoSink.info << " -> " << mCallDag.getRecordFromIndex(static_cast<size_t>(currentFunction)).name;
+@@ -712,7 +712,7 @@ static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
+ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
+ #endif
  
-                 int nextFunction = -1;
--                for (auto& calleeIndex : mCallDag.getRecordFromIndex(currentFunction).callees)
-+                for (auto& calleeIndex : mCallDag.getRecordFromIndex(static_cast<size_t>(currentFunction)).callees)
-                 {
-                     if (depths[calleeIndex] == currentDepth - 1)
-                     {
-@@ -558,7 +558,7 @@ bool TCompiler::checkCallDepth()
- bool TCompiler::tagUsedFunctions()
- {
-     // Search from main, starting from the end of the DAG as it usually is the root.
--    for (int i = mCallDag.size(); i-- > 0;)
-+    for (size_t i = mCallDag.size(); i--;)
-     {
-         if (mCallDag.getRecordFromIndex(i).name == "main(")
-         {
-diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
-index cd7ffc4..1cd787c 100644
---- a/src/compiler/translator/ParseContext.cpp
-+++ b/src/compiler/translator/ParseContext.cpp
-@@ -511,7 +511,7 @@ bool TParseContext::constructorErrorCheck(const TSourceLoc& line, TIntermNode* n
-     {
-         if (type->isUnsizedArray())
-         {
--            type->setArraySize(function.getParamCount());
-+            type->setArraySize(static_cast<int>(function.getParamCount()));
-         }
-         else if (static_cast<size_t>(type->getArraySize()) != function.getParamCount())
-         {
-diff --git a/src/compiler/translator/VariableInfo.cpp b/src/compiler/translator/VariableInfo.cpp
-index 808db95..1aa9e59 100644
---- a/src/compiler/translator/VariableInfo.cpp
-+++ b/src/compiler/translator/VariableInfo.cpp
-@@ -55,7 +55,7 @@ void ExpandVariable(const ShaderVariable &variable,
-     {
-         if (variable.isArray())
-         {
--            for (size_t elementIndex = 0; elementIndex < variable.elementCount(); elementIndex++)
-+            for (unsigned int elementIndex = 0; elementIndex < variable.elementCount(); elementIndex++)
-             {
-                 std::string lname = name + ::ArrayString(elementIndex);
-                 std::string lmappedName = mappedName + ::ArrayString(elementIndex);
-diff --git a/src/compiler/translator/blocklayout.cpp b/src/compiler/translator/blocklayout.cpp
-index 7c74105..7cc6315 100644
---- a/src/compiler/translator/blocklayout.cpp
-+++ b/src/compiler/translator/blocklayout.cpp
-@@ -27,7 +27,7 @@ BlockMemberInfo BlockLayoutEncoder::encodeType(GLenum type, unsigned int arraySi
+-#ifndef YY_NO_INPUT
++#if 0 //#ifndef YY_NO_INPUT
  
-     getBlockLayoutInfo(type, arraySize, isRowMajorMatrix, &arrayStride, &matrixStride);
+ #ifdef __cplusplus
+ static int yyinput (yyscan_t yyscanner );
+@@ -1526,7 +1526,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
+        return yy_is_jam ? 0 : yy_current_state;
+ }
  
--    const BlockMemberInfo memberInfo(mCurrentOffset * BytesPerComponent, arrayStride * BytesPerComponent, matrixStride * BytesPerComponent, isRowMajorMatrix);
-+    const BlockMemberInfo memberInfo(static_cast<int>(mCurrentOffset * BytesPerComponent), arrayStride * BytesPerComponent, matrixStride * BytesPerComponent, isRowMajorMatrix);
+-#ifndef YY_NO_INPUT
++#if 0 //#ifndef YY_NO_INPUT
+ #ifdef __cplusplus
+     static int yyinput (yyscan_t yyscanner)
+ #else
+diff --git a/src/compiler/translator/CodeGen.cpp b/src/compiler/translator/CodeGen.cpp
+index f099bcc..fe7c4f1 100644
+--- a/src/compiler/translator/CodeGen.cpp
++++ b/src/compiler/translator/CodeGen.cpp
+@@ -4,6 +4,8 @@
+ // found in the LICENSE file.
+ //
  
-     advanceOffset(type, arraySize, isRowMajorMatrix, arrayStride, matrixStride);
++#include "compiler/translator/Compiler.h"
++
+ #ifdef ANGLE_ENABLE_ESSL
+ #include "compiler/translator/TranslatorESSL.h"
+ #endif
+diff --git a/src/compiler/translator/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
+index 421597b..a58e917 100644
+--- a/src/compiler/translator/ShaderLang.cpp
++++ b/src/compiler/translator/ShaderLang.cpp
+@@ -374,4 +374,4 @@ const std::map<std::string, unsigned int> *ShGetUniformRegisterMap(const ShHandl
+     static std::map<std::string, unsigned int> map;
+     return &map;
+ #endif  // ANGLE_ENABLE_HLSL
+-}
+\ No newline at end of file
++}
+diff --git a/src/compiler/translator/TranslatorHLSL.cpp b/src/compiler/translator/TranslatorHLSL.cpp
+index 111a38b..2940260 100644
+--- a/src/compiler/translator/TranslatorHLSL.cpp
++++ b/src/compiler/translator/TranslatorHLSL.cpp
+@@ -75,4 +75,4 @@ unsigned int TranslatorHLSL::getInterfaceBlockRegister(const std::string &interf
+ const std::map<std::string, unsigned int> *TranslatorHLSL::getUniformRegisterMap() const
+ {
+     return &mUniformRegisterMap;
+-}
+\ No newline at end of file
++}
+diff --git a/src/compiler/translator/TranslatorHLSL.h b/src/compiler/translator/TranslatorHLSL.h
+index 40cfd70..4e84612 100644
+--- a/src/compiler/translator/TranslatorHLSL.h
++++ b/src/compiler/translator/TranslatorHLSL.h
+@@ -13,7 +13,9 @@ class TranslatorHLSL : public TCompiler
+ {
+   public:
+     TranslatorHLSL(sh::GLenum type, ShShaderSpec spec, ShShaderOutput output);
++#ifdef ANGLE_ENABLE_HLSL
+     TranslatorHLSL *getAsTranslatorHLSL() override { return this; }
++#endif
  
+     bool hasInterfaceBlock(const std::string &interfaceBlockName) const;
+     unsigned int getInterfaceBlockRegister(const std::string &interfaceBlockName) const;
+diff --git a/src/compiler/translator/glslang_lex.cpp b/src/compiler/translator/glslang_lex.cpp
+index ff6c2d6..1af876b 100644
+--- a/src/compiler/translator/glslang_lex.cpp
++++ b/src/compiler/translator/glslang_lex.cpp
+@@ -2090,7 +2090,7 @@ case YY_STATE_EOF(FIELDS):
+        YY_BREAK
+ case 239:
+ YY_RULE_SETUP
+-{ assert(false); return 0; }
++{ return 0; }
+        YY_BREAK
+ case 240:
+ YY_RULE_SETUP
 diff --git a/src/compiler/translator/glslang_tab.cpp b/src/compiler/translator/glslang_tab.cpp
-index 03cef93..6fb0d46 100644
+index 8b4fbd2..a799d29 100644
 --- a/src/compiler/translator/glslang_tab.cpp
 +++ b/src/compiler/translator/glslang_tab.cpp
 @@ -1,5 +1,7 @@
  /* A Bison parser, made by GNU Bison 3.0.4.  */
  
-+/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */ 
++/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
 +
  /* Bison implementation for Yacc-like parsers in C
  
     Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-diff --git a/src/libANGLE/Config.cpp b/src/libANGLE/Config.cpp
-index 1b1fc50..2a68d5b 100644
---- a/src/libANGLE/Config.cpp
-+++ b/src/libANGLE/Config.cpp
-@@ -64,7 +64,7 @@ Config::Config()
- EGLint ConfigSet::add(const Config &config)
- {
-     // Set the config's ID to a small number that starts at 1 ([EGL 1.5] section 3.4)
--    EGLint id = mConfigs.size() + 1;
-+    EGLint id = static_cast<EGLint>(mConfigs.size() + 1);
-     Config copyConfig(config);
-     copyConfig.configID = id;
-diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
-index 545284a..c8ea993 100644
---- a/src/libANGLE/Context.cpp
-+++ b/src/libANGLE/Context.cpp
-@@ -838,7 +838,7 @@ void Context::getIntegerv(GLenum pname, GLint *params)
-       case GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS: *params = mCaps.maxTransformFeedbackInterleavedComponents; break;
-       case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS:       *params = mCaps.maxTransformFeedbackSeparateAttributes;    break;
-       case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS:    *params = mCaps.maxTransformFeedbackSeparateComponents;    break;
--      case GL_NUM_COMPRESSED_TEXTURE_FORMATS:           *params = mCaps.compressedTextureFormats.size();                break;
-+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS:           *params = static_cast<GLint>(mCaps.compressedTextureFormats.size());  break;
-       case GL_MAX_SAMPLES_ANGLE:                        *params = mCaps.maxSamples;                                     break;
-       case GL_MAX_VIEWPORT_DIMS:
-         {
-@@ -853,13 +853,13 @@ void Context::getIntegerv(GLenum pname, GLint *params)
-         *params = mResetStrategy;
-         break;
-       case GL_NUM_SHADER_BINARY_FORMATS:
--        *params = mCaps.shaderBinaryFormats.size();
-+        *params = static_cast<GLint>(mCaps.shaderBinaryFormats.size());
-         break;
-       case GL_SHADER_BINARY_FORMATS:
-         std::copy(mCaps.shaderBinaryFormats.begin(), mCaps.shaderBinaryFormats.end(), params);
-         break;
-       case GL_NUM_PROGRAM_BINARY_FORMATS:
--        *params = mCaps.programBinaryFormats.size();
-+        *params = static_cast<GLint>(mCaps.programBinaryFormats.size());
-         break;
-       case GL_PROGRAM_BINARY_FORMATS:
-         std::copy(mCaps.programBinaryFormats.begin(), mCaps.programBinaryFormats.end(), params);
-@@ -939,19 +939,19 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
-       case GL_COMPRESSED_TEXTURE_FORMATS:
-         {
-             *type = GL_INT;
--            *numParams = mCaps.compressedTextureFormats.size();
-+            *numParams = static_cast<unsigned int>(mCaps.compressedTextureFormats.size());
-         }
-         return true;
-       case GL_PROGRAM_BINARY_FORMATS_OES:
-         {
-             *type = GL_INT;
--            *numParams = mCaps.programBinaryFormats.size();
-+            *numParams = static_cast<unsigned int>(mCaps.programBinaryFormats.size());
-         }
-         return true;
-       case GL_SHADER_BINARY_FORMATS:
-         {
-             *type = GL_INT;
--            *numParams = mCaps.shaderBinaryFormats.size();
-+            *numParams = static_cast<unsigned int>(mCaps.shaderBinaryFormats.size());
-         }
-         return true;
-diff --git a/src/libANGLE/Framebuffer.cpp b/src/libANGLE/Framebuffer.cpp
-index faee83c..3870e69 100644
---- a/src/libANGLE/Framebuffer.cpp
-+++ b/src/libANGLE/Framebuffer.cpp
-@@ -269,7 +269,7 @@ bool Framebuffer::hasEnabledColorAttachment() const
- {
-     for (size_t colorAttachment = 0; colorAttachment < mData.mColorAttachments.size(); ++colorAttachment)
-     {
--        if (isEnabledColorAttachment(colorAttachment))
-+        if (static_cast<unsigned int>(isEnabledColorAttachment(colorAttachment)))
-         {
-             return true;
-         }
-@@ -287,7 +287,7 @@ bool Framebuffer::usingExtendedDrawBuffers() const
- {
-     for (size_t colorAttachment = 1; colorAttachment < mData.mColorAttachments.size(); ++colorAttachment)
-     {
--        if (isEnabledColorAttachment(colorAttachment))
-+        if (static_cast<unsigned int>(isEnabledColorAttachment(colorAttachment)))
-         {
-             return true;
-         }
-diff --git a/src/libANGLE/ImageIndex.cpp b/src/libANGLE/ImageIndex.cpp
-index ac7302d..538258f 100644
---- a/src/libANGLE/ImageIndex.cpp
-+++ b/src/libANGLE/ImageIndex.cpp
-@@ -35,7 +35,7 @@ ImageIndex ImageIndex::Make2D(GLint mipIndex)
- ImageIndex ImageIndex::MakeCube(GLenum target, GLint mipIndex)
- {
-     ASSERT(gl::IsCubeMapTextureTarget(target));
--    return ImageIndex(target, mipIndex, CubeMapTextureTargetToLayerIndex(target));
-+    return ImageIndex(target, mipIndex, static_cast<int>(CubeMapTextureTargetToLayerIndex(target)));
- }
- ImageIndex ImageIndex::Make2DArray(GLint mipIndex, GLint layerIndex)
-@@ -50,7 +50,7 @@ ImageIndex ImageIndex::Make3D(GLint mipIndex, GLint layerIndex)
- ImageIndex ImageIndex::MakeGeneric(GLenum target, GLint mipIndex)
- {
--    GLint layerIndex = IsCubeMapTextureTarget(target) ? CubeMapTextureTargetToLayerIndex(target) : ENTIRE_LEVEL;
-+    GLint layerIndex = IsCubeMapTextureTarget(target) ? static_cast<GLint>(CubeMapTextureTargetToLayerIndex(target)) : ENTIRE_LEVEL;
-     return ImageIndex(target, mipIndex, layerIndex);
- }
-diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
-index e215379..42f09b9 100644
---- a/src/libANGLE/Program.cpp
-+++ b/src/libANGLE/Program.cpp
-@@ -483,7 +483,7 @@ Error Program::saveBinary(GLenum *binaryFormat, void *binary, GLsizei bufSize, G
-         return error;
-     }
--    GLsizei streamLength = stream.length();
-+    GLsizei streamLength = static_cast<GLsizei>(stream.length());
-     const void *streamData = stream.data();
-     if (streamLength > bufSize)
-@@ -645,7 +645,7 @@ void Program::getActiveAttribute(GLuint index, GLsizei bufsize, GLsizei *length,
-             if (length)
-             {
--                *length = strlen(name);
-+                *length = static_cast<GLsizei>(strlen(name));
-             }
-         }
-@@ -762,7 +762,7 @@ void Program::getActiveUniform(GLuint index, GLsizei bufsize, GLsizei *length, G
-             if (length)
-             {
--                *length = strlen(name);
-+                *length = static_cast<GLsizei>(strlen(name));
-             }
-         }
-@@ -790,7 +790,7 @@ GLint Program::getActiveUniformCount()
- {
-     if (mLinked)
-     {
--        return mProgram->getUniforms().size();
-+        return static_cast<GLint>(mProgram->getUniforms().size());
-     }
-     else
-     {
-@@ -804,7 +804,7 @@ GLint Program::getActiveUniformMaxLength()
-     if (mLinked)
-     {
--        unsigned int numUniforms = mProgram->getUniforms().size();
-+        unsigned int numUniforms = static_cast<unsigned int>(mProgram->getUniforms().size());
-         for (unsigned int uniformIndex = 0; uniformIndex < numUniforms; uniformIndex++)
-         {
-             if (!mProgram->getUniforms()[uniformIndex]->name.empty())
-@@ -1042,7 +1042,7 @@ void Program::updateSamplerMapping()
- GLuint Program::getActiveUniformBlockCount()
- {
--    return mProgram->getUniformBlocks().size();
-+    return static_cast<GLuint>(mProgram->getUniformBlocks().size());
- }
- void Program::getActiveUniformBlockName(GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName) const
-@@ -1065,7 +1065,7 @@ void Program::getActiveUniformBlockName(GLuint uniformBlockIndex, GLsizei bufSiz
-         if (length)
-         {
--            *length = strlen(uniformBlockName);
-+            *length = static_cast<GLsizei>(strlen(uniformBlockName));
-         }
-     }
- }
-@@ -1111,13 +1111,13 @@ GLint Program::getActiveUniformBlockMaxLength()
+diff --git a/src/compiler/translator/glslang_tab.h b/src/compiler/translator/glslang_tab.h
+index 7331594..eb7ef39 100644
+--- a/src/compiler/translator/glslang_tab.h
++++ b/src/compiler/translator/glslang_tab.h
+@@ -1,5 +1,7 @@
+ /* A Bison parser, made by GNU Bison 3.0.4.  */
  
-     if (mLinked)
-     {
--        unsigned int numUniformBlocks = mProgram->getUniformBlocks().size();
-+        unsigned int numUniformBlocks = static_cast<unsigned int>(mProgram->getUniformBlocks().size());
-         for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < numUniformBlocks; uniformBlockIndex++)
-         {
-             const UniformBlock &uniformBlock = *mProgram->getUniformBlocks()[uniformBlockIndex];
-             if (!uniformBlock.name.empty())
-             {
--                const int length = uniformBlock.name.length() + 1;
-+                const int length = static_cast<int>(uniformBlock.name.length() + 1);
++/* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license. */
++
+ /* Bison interface for Yacc-like parsers in C
  
-                 // Counting in "[0]".
-                 const int arrayLength = (uniformBlock.isArrayElement() ? 3 : 0);
-@@ -1466,7 +1466,7 @@ bool Program::areMatchingInterfaceBlocks(gl::InfoLog &infoLog, const sh::Interfa
-         infoLog.append("Layout qualifiers differ for interface block '%s' between vertex and fragment shaders", blockName);
-         return false;
-     }
--    const unsigned int numBlockMembers = vertexInterfaceBlock.fields.size();
-+    const unsigned int numBlockMembers = static_cast<unsigned int>(vertexInterfaceBlock.fields.size());
-     for (unsigned int blockMemberIndex = 0; blockMemberIndex < numBlockMembers; blockMemberIndex++)
-     {
-         const sh::InterfaceBlockField &vertexMember = vertexInterfaceBlock.fields[blockMemberIndex];
-@@ -1510,7 +1510,7 @@ bool Program::linkValidateVariablesBase(InfoLog &infoLog, const std::string &var
-         infoLog.append("Structure lengths for %s differ between vertex and fragment shaders", variableName.c_str());
-         return false;
-     }
--    const unsigned int numMembers = vertexVariable.fields.size();
-+    const unsigned int numMembers = static_cast<unsigned int>(vertexVariable.fields.size());
-     for (unsigned int memberIndex = 0; memberIndex < numMembers; memberIndex++)
+    Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+diff --git a/src/libANGLE/Display.cpp b/src/libANGLE/Display.cpp
+index c94dff2..4de579b 100644
+--- a/src/libANGLE/Display.cpp
++++ b/src/libANGLE/Display.cpp
+@@ -139,6 +139,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const AttributeMap &attribMap)
+     switch (displayType)
      {
-         const sh::ShaderVariable &vertexMember = vertexVariable.fields[memberIndex];
-diff --git a/src/libANGLE/Renderbuffer.cpp b/src/libANGLE/Renderbuffer.cpp
-index 85b920b..34cc365 100644
---- a/src/libANGLE/Renderbuffer.cpp
-+++ b/src/libANGLE/Renderbuffer.cpp
-@@ -42,8 +42,8 @@ Error Renderbuffer::setStorage(GLenum internalformat, size_t width, size_t heigh
-         return error;
-     }
--    mWidth = width;
--    mHeight = height;
-+    mWidth = static_cast<GLsizei>(width);
-+    mHeight = static_cast<GLsizei>(height);
-     mInternalFormat = internalformat;
-     mSamples = 0;
-@@ -58,10 +58,10 @@ Error Renderbuffer::setStorageMultisample(size_t samples, GLenum internalformat,
-         return error;
-     }
--    mWidth = width;
--    mHeight = height;
-+    mWidth = static_cast<GLsizei>(width);
-+    mHeight = static_cast<GLsizei>(height);
-     mInternalFormat = internalformat;
--    mSamples = samples;
-+    mSamples = static_cast<GLsizei>(samples);
-     return Error(GL_NO_ERROR);
- }
-diff --git a/src/libANGLE/Shader.cpp b/src/libANGLE/Shader.cpp
-index 7af4ff3..5106e95 100644
---- a/src/libANGLE/Shader.cpp
-+++ b/src/libANGLE/Shader.cpp
-@@ -66,7 +66,7 @@ void Shader::setSource(GLsizei count, const char *const *string, const GLint *le
- int Shader::getInfoLogLength() const
- {
--    return  mShader->getInfoLog().empty() ? 0 : (mShader->getInfoLog().length() + 1);
-+    return  mShader->getInfoLog().empty() ? 0 : static_cast<int>(mShader->getInfoLog().length() + 1);
- }
- void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) const
-@@ -89,12 +89,12 @@ void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog) const
- int Shader::getSourceLength() const
- {
--    return mSource.empty() ? 0 : (mSource.length() + 1);
-+    return mSource.empty() ? 0 : static_cast<int>(mSource.length() + 1);
- }
- int Shader::getTranslatedSourceLength() const
- {
--    return mShader->getTranslatedSource().empty() ? 0 : (mShader->getTranslatedSource().length() + 1);
-+    return mShader->getTranslatedSource().empty() ? 0 : static_cast<int>(mShader->getTranslatedSource().length() + 1);
- }
- void Shader::getSourceImpl(const std::string &source, GLsizei bufSize, GLsizei *length, char *buffer)
-diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
-index f731774..f6837f4 100644
---- a/src/libANGLE/State.cpp
-+++ b/src/libANGLE/State.cpp
-@@ -569,7 +569,7 @@ void State::setActiveSampler(unsigned int active)
- unsigned int State::getActiveSampler() const
- {
--    return mActiveSampler;
-+    return static_cast<unsigned int>(mActiveSampler);
- }
- void State::setSamplerTexture(GLenum type, Texture *texture)
-@@ -1192,7 +1192,7 @@ void State::getIntegerv(const gl::Data &data, GLenum pname, GLint *params)
-       case GL_UNPACK_ROW_LENGTH:                        *params = mUnpack.rowLength;                              break;
-       case GL_GENERATE_MIPMAP_HINT:                     *params = mGenerateMipmapHint;                            break;
-       case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES:      *params = mFragmentShaderDerivativeHint;                  break;
--      case GL_ACTIVE_TEXTURE:                           *params = (mActiveSampler + GL_TEXTURE0);                 break;
-+      case GL_ACTIVE_TEXTURE:                           *params = static_cast<GLint>(mActiveSampler + GL_TEXTURE0);     break;
-       case GL_STENCIL_FUNC:                             *params = mDepthStencil.stencilFunc;                      break;
-       case GL_STENCIL_REF:                              *params = mStencilRef;                                    break;
-       case GL_STENCIL_VALUE_MASK:                       *params = clampToInt(mDepthStencil.stencilMask);          break;
-@@ -1316,19 +1316,19 @@ void State::getIntegerv(const gl::Data &data, GLenum pname, GLint *params)
-         break;
-       case GL_TEXTURE_BINDING_2D:
-         ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
--        *params = getSamplerTextureId(mActiveSampler, GL_TEXTURE_2D) ;
-+        *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), GL_TEXTURE_2D) ;
-         break;
-       case GL_TEXTURE_BINDING_CUBE_MAP:
-         ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
--        *params = getSamplerTextureId(mActiveSampler, GL_TEXTURE_CUBE_MAP);
-+        *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), GL_TEXTURE_CUBE_MAP);
-         break;
-       case GL_TEXTURE_BINDING_3D:
-         ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
--        *params = getSamplerTextureId(mActiveSampler, GL_TEXTURE_3D);
-+        *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), GL_TEXTURE_3D);
-         break;
-       case GL_TEXTURE_BINDING_2D_ARRAY:
-         ASSERT(mActiveSampler < mMaxCombinedTextureImageUnits);
--        *params = getSamplerTextureId(mActiveSampler, GL_TEXTURE_2D_ARRAY);
-+        *params = getSamplerTextureId(static_cast<unsigned int>(mActiveSampler), GL_TEXTURE_2D_ARRAY);
+       case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
++#if defined(ANGLE_ENABLE_OPENGL)
+ #if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)
+         // Default to D3D displays
+         impl = new rx::DisplayD3D();
+@@ -150,6 +151,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const AttributeMap &attribMap)
+         // No display available
+         UNREACHABLE();
+ #endif
++#endif
          break;
-       case GL_UNIFORM_BUFFER_BINDING:
-         *params = mGenericUniformBuffer.id();
-diff --git a/src/libANGLE/Surface.cpp b/src/libANGLE/Surface.cpp
-index c42b69d..9742f5d 100644
---- a/src/libANGLE/Surface.cpp
-+++ b/src/libANGLE/Surface.cpp
-@@ -135,12 +135,12 @@ EGLint Surface::isFixedSize() const
- EGLint Surface::getWidth() const
- {
--    return mFixedSize ? mFixedWidth : mImplementation->getWidth();
-+    return mFixedSize ? static_cast<EGLint>(mFixedWidth) : mImplementation->getWidth();
- }
- EGLint Surface::getHeight() const
- {
--    return mFixedSize ? mFixedHeight : mImplementation->getHeight();
-+    return mFixedSize ? static_cast<EGLint>(mFixedHeight) : mImplementation->getHeight();
- }
- Error Surface::bindTexImage(gl::Texture *texture, EGLint buffer)
-diff --git a/src/libANGLE/Texture.cpp b/src/libANGLE/Texture.cpp
-index 1ab5c7d..437ba0d 100644
---- a/src/libANGLE/Texture.cpp
-+++ b/src/libANGLE/Texture.cpp
-@@ -266,7 +266,7 @@ Error Texture::setStorage(GLenum target, size_t levels, GLenum internalFormat, c
-     releaseTexImage();
--    mImmutableLevelCount = levels;
-+    mImmutableLevelCount = static_cast<GLsizei>(levels);
-     clearImageDescs();
-     setImageDescChain(levels, size, internalFormat);
-@@ -295,16 +295,16 @@ void Texture::setImageDescChain(size_t levels, Extents baseSize, GLenum sizedInt
- {
-     for (size_t level = 0; level < levels; level++)
-     {
--        Extents levelSize(std::max<size_t>(baseSize.width >> level, 1),
--                          std::max<size_t>(baseSize.height >> level, 1),
--                          (mTarget == GL_TEXTURE_2D_ARRAY) ? baseSize.depth : std::max<size_t>(baseSize.depth >> level, 1));
-+        Extents levelSize(std::max<int>(baseSize.width >> level, 1),
-+                          std::max<int>(baseSize.height >> level, 1),
-+                          (mTarget == GL_TEXTURE_2D_ARRAY) ? baseSize.depth : std::max<int>(baseSize.depth >> level, 1));
-         ImageDesc levelInfo(levelSize, sizedInternalFormat);
-         if (mTarget == GL_TEXTURE_CUBE_MAP)
-         {
-             for (size_t face = FirstCubeMapTextureTarget; face <= LastCubeMapTextureTarget; face++)
-             {
--                setImageDesc(face, level, levelInfo);
-+                setImageDesc(static_cast<GLenum>(face), level, levelInfo);
-             }
-         }
-         else
-@@ -571,12 +571,12 @@ Texture::SamplerCompletenessCache::SamplerCompletenessCache()
- GLsizei Texture::getAttachmentWidth(const gl::FramebufferAttachment::Target &target) const
- {
--    return getWidth(target.textureIndex().type, target.textureIndex().mipIndex);
-+    return static_cast<GLsizei>(getWidth(target.textureIndex().type, target.textureIndex().mipIndex));
- }
- GLsizei Texture::getAttachmentHeight(const gl::FramebufferAttachment::Target &target) const
- {
--    return getHeight(target.textureIndex().type, target.textureIndex().mipIndex);
-+    return static_cast<GLsizei>(getHeight(target.textureIndex().type, target.textureIndex().mipIndex));
- }
- GLenum Texture::getAttachmentInternalFormat(const gl::FramebufferAttachment::Target &target) const
-diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
-index 1896138..2a288a2 100644
---- a/src/libANGLE/validationES.cpp
-+++ b/src/libANGLE/validationES.cpp
-@@ -174,7 +174,7 @@ bool ValidMipLevel(const Context *context, GLenum target, GLint level)
-       default: UNREACHABLE();
-     }
--    return level <= gl::log2(maxDimension);
-+    return level <= gl::log2(static_cast<int>(maxDimension));
- }
  
- bool ValidImageSize(const Context *context, GLenum target, GLint level,
+       case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE:
index 255d8b7..516eaaa 100644 (file)
@@ -1,4 +1,4 @@
-# This file is used by gcl to get repository specific information.\r
-GERRIT_HOST: chromium-review.googlesource.com\r
-GERRIT_PORT: 29418\r
-CODE_REVIEW_SERVER: chromium-review.googlesource.com\r
+# This file is used by git cl to get repository specific information.
+CODE_REVIEW_SERVER: https://chromium-review.googlesource.com
+GERRIT_HOST: True
+TRYSERVER_GERRIT_URL: https://chromium-review.googlesource.com
index 4b0ea72..2d919b0 100644 (file)
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 /*
-** Copyright (c) 2013-2014 The Khronos Group Inc.
+** Copyright (c) 2013-2016 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -33,12 +33,12 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 27018 $ on $Date: 2014-06-10 08:06:12 -0700 (Tue, 10 Jun 2014) $
+** Khronos $Revision: 32432 $ on $Date: 2016-02-09 23:01:07 -0800 (Tue, 09 Feb 2016) $
 */
 
 #include <EGL/eglplatform.h>
 
-#define EGL_EGLEXT_VERSION 20140610
+#define EGL_EGLEXT_VERSION 20160209
 
 /* Generated C header for:
  * API: egl
@@ -94,12 +94,55 @@ EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type,
 #define EGL_OPENGL_ES3_BIT_KHR            0x00000040
 #endif /* EGL_KHR_create_context */
 
+#ifndef EGL_KHR_create_context_no_error
+#define EGL_KHR_create_context_no_error 1
+#define EGL_CONTEXT_OPENGL_NO_ERROR_KHR   0x31B3
+#endif /* EGL_KHR_create_context_no_error */
+
+#ifndef EGL_KHR_debug
+#define EGL_KHR_debug 1
+typedef void *EGLLabelKHR;
+typedef void *EGLObjectKHR;
+typedef void (EGLAPIENTRY  *EGLDEBUGPROCKHR)(EGLenum error,const char *command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR objectLabel,const char* message);
+#define EGL_OBJECT_THREAD_KHR             0x33B0
+#define EGL_OBJECT_DISPLAY_KHR            0x33B1
+#define EGL_OBJECT_CONTEXT_KHR            0x33B2
+#define EGL_OBJECT_SURFACE_KHR            0x33B3
+#define EGL_OBJECT_IMAGE_KHR              0x33B4
+#define EGL_OBJECT_SYNC_KHR               0x33B5
+#define EGL_OBJECT_STREAM_KHR             0x33B6
+#define EGL_DEBUG_MSG_CRITICAL_KHR        0x33B9
+#define EGL_DEBUG_MSG_ERROR_KHR           0x33BA
+#define EGL_DEBUG_MSG_WARN_KHR            0x33BB
+#define EGL_DEBUG_MSG_INFO_KHR            0x33BC
+#define EGL_DEBUG_CALLBACK_KHR            0x33B8
+typedef EGLint (EGLAPIENTRYP PFNEGLDEBUGMESSAGECONTROLKHRPROC) (EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEBUGKHRPROC) (EGLint attribute, EGLAttrib *value);
+typedef EGLint (EGLAPIENTRYP PFNEGLLABELOBJECTKHRPROC) (EGLDisplay display, EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLint EGLAPIENTRY eglDebugMessageControlKHR (EGLDEBUGPROCKHR callback, const EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDebugKHR (EGLint attribute, EGLAttrib *value);
+EGLAPI EGLint EGLAPIENTRY eglLabelObjectKHR (EGLDisplay display, EGLenum objectType, EGLObjectKHR object, EGLLabelKHR label);
+#endif
+#endif /* EGL_KHR_debug */
+
 #ifndef EGL_KHR_fence_sync
 #define EGL_KHR_fence_sync 1
+typedef khronos_utime_nanoseconds_t EGLTimeKHR;
 #ifdef KHRONOS_SUPPORT_INT64
 #define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR 0x30F0
 #define EGL_SYNC_CONDITION_KHR            0x30F8
 #define EGL_SYNC_FENCE_KHR                0x30F9
+typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);
+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR (EGLDisplay dpy, EGLSyncKHR sync);
+EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#endif
 #endif /* KHRONOS_SUPPORT_INT64 */
 #endif /* EGL_KHR_fence_sync */
 
@@ -207,6 +250,15 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface64KHR (EGLDisplay dpy, EGLSurface s
 #endif
 #endif /* EGL_KHR_lock_surface3 */
 
+#ifndef EGL_KHR_partial_update
+#define EGL_KHR_partial_update 1
+#define EGL_BUFFER_AGE_KHR                0x313D
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETDAMAGEREGIONKHRPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSetDamageRegionKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#endif
+#endif /* EGL_KHR_partial_update */
+
 #ifndef EGL_KHR_platform_android
 #define EGL_KHR_platform_android 1
 #define EGL_PLATFORM_ANDROID_KHR          0x3141
@@ -230,7 +282,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface64KHR (EGLDisplay dpy, EGLSurface s
 
 #ifndef EGL_KHR_reusable_sync
 #define EGL_KHR_reusable_sync 1
-typedef khronos_utime_nanoseconds_t EGLTimeKHR;
 #ifdef KHRONOS_SUPPORT_INT64
 #define EGL_SYNC_STATUS_KHR               0x30F1
 #define EGL_SIGNALED_KHR                  0x30F2
@@ -242,17 +293,9 @@ typedef khronos_utime_nanoseconds_t EGLTimeKHR;
 #define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR   0x0001
 #define EGL_FOREVER_KHR                   0xFFFFFFFFFFFFFFFFull
 #define EGL_NO_SYNC_KHR                   ((EGLSyncKHR)0)
-typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);
-typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
 #ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
-EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR (EGLDisplay dpy, EGLSyncKHR sync);
-EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
 EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
-EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
 #endif
 #endif /* KHRONOS_SUPPORT_INT64 */
 #endif /* EGL_KHR_reusable_sync */
@@ -354,6 +397,14 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateStreamProducerSurfaceKHR (EGLDisplay dpy,
 #define EGL_KHR_surfaceless_context 1
 #endif /* EGL_KHR_surfaceless_context */
 
+#ifndef EGL_KHR_swap_buffers_with_damage
+#define EGL_KHR_swap_buffers_with_damage 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#endif
+#endif /* EGL_KHR_swap_buffers_with_damage */
+
 #ifndef EGL_KHR_vg_parent_image
 #define EGL_KHR_vg_parent_image 1
 #define EGL_VG_PARENT_IMAGE_KHR           0x30BA
@@ -410,10 +461,16 @@ EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID (EGLDisplay dpy, EGLSyncKHR
 #define EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE 0x3200
 #endif /* EGL_ANGLE_d3d_share_handle_client_buffer */
 
-#ifndef EGL_ANGLE_window_fixed_size
-#define EGL_ANGLE_window_fixed_size 1
-#define EGL_FIXED_SIZE_ANGLE        0x3201
-#endif /* EGL_ANGLE_window_fixed_size */
+#ifndef EGL_ANGLE_device_d3d
+#define EGL_ANGLE_device_d3d 1
+#define EGL_D3D9_DEVICE_ANGLE             0x33A0
+#define EGL_D3D11_DEVICE_ANGLE            0x33A1
+#endif /* EGL_ANGLE_device_d3d */
+
+#ifndef EGL_ANGLE_keyed_mutex
+#define EGL_ANGLE_keyed_mutex 1
+#define EGL_DXGI_KEYED_MUTEX_ANGLE        0x33A2
+#endif /* EGL_ANGLE_keyed_mutex */
 
 #ifndef EGL_ANGLE_query_surface_pointer
 #define EGL_ANGLE_query_surface_pointer 1
@@ -438,6 +495,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu
 #define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1
 #endif /* EGL_ANGLE_surface_d3d_texture_2d_share_handle */
 
+#ifndef EGL_ANGLE_direct_composition
+#define EGL_ANGLE_direct_composition 1
+#define EGL_DIRECT_COMPOSITION_ANGLE 0x33A5
+#endif /* EGL_ANGLE_direct_composition */
+
 #ifndef EGL_ANGLE_platform_angle
 #define EGL_ANGLE_platform_angle 1
 #define EGL_PLATFORM_ANGLE_ANGLE          0x3202
@@ -464,11 +526,46 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu
 #define EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE 0x320E
 #endif /* EGL_ANGLE_platform_angle_opengl */
 
-#ifndef EGL_ANGLE_device_d3d
-#define EGL_ANGLE_device_d3d 1
-#define EGL_D3D9_DEVICE_ANGLE             0x33A0
-#define EGL_D3D11_DEVICE_ANGLE            0x33A1
-#endif /* EGL_ANGLE_device_d3d */
+#ifndef EGL_ANGLE_window_fixed_size
+#define EGL_ANGLE_window_fixed_size 1
+#define EGL_FIXED_SIZE_ANGLE              0x3201
+#endif /* EGL_ANGLE_window_fixed_size */
+
+#ifndef EGL_ANGLE_x11_visual
+#define EGL_ANGLE_x11_visual
+#define EGL_X11_VISUAL_ID_ANGLE 0x33A3
+#endif /* EGL_ANGLE_x11_visual */
+
+#ifndef EGL_ANGLE_flexible_surface_compatibility
+#define EGL_ANGLE_flexible_surface_compatibility 1
+#define EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE 0x33A6
+#endif /* EGL_ANGLE_flexible_surface_compatibility */
+
+#ifndef EGL_ANGLE_surface_orientation
+#define EGL_ANGLE_surface_orientation
+#define EGL_OPTIMAL_SURFACE_ORIENTATION_ANGLE 0x33A7
+#define EGL_SURFACE_ORIENTATION_ANGLE 0x33A8
+#define EGL_SURFACE_ORIENTATION_INVERT_X_ANGLE 0x0001
+#define EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE 0x0002
+#endif /* EGL_ANGLE_surface_orientation */
+
+#ifndef EGL_ANGLE_experimental_present_path
+#define EGL_ANGLE_experimental_present_path
+#define EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE 0x33A4
+#define EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE 0x33A9
+#define EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE 0x33AA
+#endif /* EGL_ANGLE_experimental_present_path */
+
+#ifndef EGL_ANGLE_stream_producer_d3d_texture_nv12
+#define EGL_ANGLE_stream_producer_d3d_texture_nv12
+#define EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE 0x3AAB
+typedef EGLBoolean(EGLAPIENTRYP PFNEGLCREATESTREAMPRODUCERD3DTEXTURENV12ANGLEPROC)(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
+typedef EGLBoolean(EGLAPIENTRYP PFNEGLSTREAMPOSTD3DTEXTURENV12ANGLEPROC)(EGLDisplay dpy, EGLStreamKHR stream, void *texture, const EGLAttrib *attrib_list);
+#ifdef EGL_EXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglCreateStreamProducerD3DTextureNV12ANGLE(EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamPostD3DTextureNV12ANGLE(EGLDisplay dpy, EGLStreamKHR stream, void *texture, const EGLAttrib *attrib_list);
+#endif
+#endif /* EGL_ANGLE_stream_producer_d3d_texture_nv12 */
 
 #ifndef EGL_ARM_pixmap_multisample_discard
 #define EGL_ARM_pixmap_multisample_discard 1
@@ -510,6 +607,30 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a
 #endif
 #endif /* EGL_EXT_device_base */
 
+#ifndef EGL_ANGLE_device_creation
+#define EGL_ANGLE_device_creation 1
+typedef EGLDeviceEXT (EGLAPIENTRYP PFNEGLCREATEDEVICEANGLEPROC) (EGLint device_type, void *native_device, const EGLAttrib *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASEDEVICEANGLEPROC) (EGLDeviceEXT device);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLDeviceEXT EGLAPIENTRY eglCreateDeviceANGLE (EGLint device_type, void *native_device, const EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglReleaseDeviceANGLE (EGLDeviceEXT device);
+#endif
+#endif /* EGL_ANGLE_device_creation */
+
+#ifndef EGL_EXT_device_drm
+#define EGL_EXT_device_drm 1
+#define EGL_DRM_DEVICE_FILE_EXT           0x3233
+#endif /* EGL_EXT_device_drm */
+
+#ifndef EGL_EXT_device_enumeration
+#define EGL_EXT_device_enumeration 1
+#endif /* EGL_EXT_device_enumeration */
+
+#ifndef EGL_EXT_device_openwf
+#define EGL_EXT_device_openwf 1
+#define EGL_OPENWF_DEVICE_ID_EXT          0x3237
+#endif /* EGL_EXT_device_openwf */
+
 #ifndef EGL_EXT_device_query
 #define EGL_EXT_device_query 1
 #endif /* EGL_EXT_device_query */
@@ -545,6 +666,48 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a
 #define EGL_MULTIVIEW_VIEW_COUNT_EXT      0x3134
 #endif /* EGL_EXT_multiview_window */
 
+#ifndef EGL_EXT_output_base
+#define EGL_EXT_output_base 1
+typedef void *EGLOutputLayerEXT;
+typedef void *EGLOutputPortEXT;
+#define EGL_NO_OUTPUT_LAYER_EXT           ((EGLOutputLayerEXT)0)
+#define EGL_NO_OUTPUT_PORT_EXT            ((EGLOutputPortEXT)0)
+#define EGL_BAD_OUTPUT_LAYER_EXT          0x322D
+#define EGL_BAD_OUTPUT_PORT_EXT           0x322E
+#define EGL_SWAP_INTERVAL_EXT             0x322F
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETOUTPUTLAYERSEXTPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list, EGLOutputLayerEXT *layers, EGLint max_layers, EGLint *num_layers);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETOUTPUTPORTSEXTPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list, EGLOutputPortEXT *ports, EGLint max_ports, EGLint *num_ports);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLOUTPUTLAYERATTRIBEXTPROC) (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint attribute, EGLAttrib value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYOUTPUTLAYERATTRIBEXTPROC) (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint attribute, EGLAttrib *value);
+typedef const char *(EGLAPIENTRYP PFNEGLQUERYOUTPUTLAYERSTRINGEXTPROC) (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint name);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLOUTPUTPORTATTRIBEXTPROC) (EGLDisplay dpy, EGLOutputPortEXT port, EGLint attribute, EGLAttrib value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYOUTPUTPORTATTRIBEXTPROC) (EGLDisplay dpy, EGLOutputPortEXT port, EGLint attribute, EGLAttrib *value);
+typedef const char *(EGLAPIENTRYP PFNEGLQUERYOUTPUTPORTSTRINGEXTPROC) (EGLDisplay dpy, EGLOutputPortEXT port, EGLint name);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglGetOutputLayersEXT (EGLDisplay dpy, const EGLAttrib *attrib_list, EGLOutputLayerEXT *layers, EGLint max_layers, EGLint *num_layers);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetOutputPortsEXT (EGLDisplay dpy, const EGLAttrib *attrib_list, EGLOutputPortEXT *ports, EGLint max_ports, EGLint *num_ports);
+EGLAPI EGLBoolean EGLAPIENTRY eglOutputLayerAttribEXT (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint attribute, EGLAttrib value);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryOutputLayerAttribEXT (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint attribute, EGLAttrib *value);
+EGLAPI const char *EGLAPIENTRY eglQueryOutputLayerStringEXT (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint name);
+EGLAPI EGLBoolean EGLAPIENTRY eglOutputPortAttribEXT (EGLDisplay dpy, EGLOutputPortEXT port, EGLint attribute, EGLAttrib value);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryOutputPortAttribEXT (EGLDisplay dpy, EGLOutputPortEXT port, EGLint attribute, EGLAttrib *value);
+EGLAPI const char *EGLAPIENTRY eglQueryOutputPortStringEXT (EGLDisplay dpy, EGLOutputPortEXT port, EGLint name);
+#endif
+#endif /* EGL_EXT_output_base */
+
+#ifndef EGL_EXT_output_drm
+#define EGL_EXT_output_drm 1
+#define EGL_DRM_CRTC_EXT                  0x3234
+#define EGL_DRM_PLANE_EXT                 0x3235
+#define EGL_DRM_CONNECTOR_EXT             0x3236
+#endif /* EGL_EXT_output_drm */
+
+#ifndef EGL_EXT_output_openwf
+#define EGL_EXT_output_openwf 1
+#define EGL_OPENWF_PIPELINE_ID_EXT        0x3238
+#define EGL_OPENWF_PORT_ID_EXT            0x3239
+#endif /* EGL_EXT_output_openwf */
+
 #ifndef EGL_EXT_platform_base
 #define EGL_EXT_platform_base 1
 typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
@@ -578,6 +741,14 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy,
 #define EGL_PROTECTED_CONTENT_EXT         0x32C0
 #endif /* EGL_EXT_protected_surface */
 
+#ifndef EGL_EXT_stream_consumer_egloutput
+#define EGL_EXT_stream_consumer_egloutput 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMEROUTPUTEXTPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLOutputLayerEXT layer);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerOutputEXT (EGLDisplay dpy, EGLStreamKHR stream, EGLOutputLayerEXT layer);
+#endif
+#endif /* EGL_EXT_stream_consumer_egloutput */
+
 #ifndef EGL_EXT_swap_buffers_with_damage
 #define EGL_EXT_swap_buffers_with_damage 1
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
@@ -586,6 +757,35 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSu
 #endif
 #endif /* EGL_EXT_swap_buffers_with_damage */
 
+#ifndef EGL_EXT_yuv_surface
+#define EGL_EXT_yuv_surface 1
+#define EGL_YUV_ORDER_EXT                 0x3301
+#define EGL_YUV_NUMBER_OF_PLANES_EXT      0x3311
+#define EGL_YUV_SUBSAMPLE_EXT             0x3312
+#define EGL_YUV_DEPTH_RANGE_EXT           0x3317
+#define EGL_YUV_CSC_STANDARD_EXT          0x330A
+#define EGL_YUV_PLANE_BPP_EXT             0x331A
+#define EGL_YUV_BUFFER_EXT                0x3300
+#define EGL_YUV_ORDER_YUV_EXT             0x3302
+#define EGL_YUV_ORDER_YVU_EXT             0x3303
+#define EGL_YUV_ORDER_YUYV_EXT            0x3304
+#define EGL_YUV_ORDER_UYVY_EXT            0x3305
+#define EGL_YUV_ORDER_YVYU_EXT            0x3306
+#define EGL_YUV_ORDER_VYUY_EXT            0x3307
+#define EGL_YUV_ORDER_AYUV_EXT            0x3308
+#define EGL_YUV_SUBSAMPLE_4_2_0_EXT       0x3313
+#define EGL_YUV_SUBSAMPLE_4_2_2_EXT       0x3314
+#define EGL_YUV_SUBSAMPLE_4_4_4_EXT       0x3315
+#define EGL_YUV_DEPTH_RANGE_LIMITED_EXT   0x3318
+#define EGL_YUV_DEPTH_RANGE_FULL_EXT      0x3319
+#define EGL_YUV_CSC_STANDARD_601_EXT      0x330B
+#define EGL_YUV_CSC_STANDARD_709_EXT      0x330C
+#define EGL_YUV_CSC_STANDARD_2020_EXT     0x330D
+#define EGL_YUV_PLANE_BPP_0_EXT           0x331B
+#define EGL_YUV_PLANE_BPP_8_EXT           0x331C
+#define EGL_YUV_PLANE_BPP_10_EXT          0x331D
+#endif /* EGL_EXT_yuv_surface */
+
 #ifndef EGL_HI_clientpixmap
 #define EGL_HI_clientpixmap 1
 struct EGLClientPixmapHI {
@@ -617,6 +817,12 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfi
 #define EGL_CONTEXT_PRIORITY_LOW_IMG      0x3103
 #endif /* EGL_IMG_context_priority */
 
+#ifndef EGL_IMG_image_plane_attribs
+#define EGL_IMG_image_plane_attribs 1
+#define EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG 0x3105
+#define EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG 0x3106
+#endif /* EGL_IMG_image_plane_attribs */
+
 #ifndef EGL_MESA_drm_image
 #define EGL_MESA_drm_image 1
 #define EGL_DRM_BUFFER_FORMAT_MESA        0x31D0
@@ -634,6 +840,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglExportDRMImageMESA (EGLDisplay dpy, EGLImageKHR
 #endif
 #endif /* EGL_MESA_drm_image */
 
+#ifndef EGL_MESA_image_dma_buf_export
+#define EGL_MESA_image_dma_buf_export 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC) (EGLDisplay dpy, EGLImageKHR image, int *fourcc, int *num_planes, EGLuint64KHR *modifiers);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDMABUFIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, int *fds, EGLint *strides, EGLint *offsets);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageQueryMESA (EGLDisplay dpy, EGLImageKHR image, int *fourcc, int *num_planes, EGLuint64KHR *modifiers);
+EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageMESA (EGLDisplay dpy, EGLImageKHR image, int *fds, EGLint *strides, EGLint *offsets);
+#endif
+#endif /* EGL_MESA_image_dma_buf_export */
+
 #ifndef EGL_MESA_platform_gbm
 #define EGL_MESA_platform_gbm 1
 #define EGL_PLATFORM_GBM_MESA             0x31D7
@@ -678,6 +894,13 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegion2NOK (EGLDisplay dpy, EGLSurfa
 #define EGL_COVERAGE_SAMPLE_RESOLVE_NONE_NV 0x3133
 #endif /* EGL_NV_coverage_sample_resolve */
 
+#ifndef EGL_NV_cuda_event
+#define EGL_NV_cuda_event 1
+#define EGL_CUDA_EVENT_HANDLE_NV          0x323B
+#define EGL_SYNC_CUDA_EVENT_NV            0x323C
+#define EGL_SYNC_CUDA_EVENT_COMPLETE_NV   0x323D
+#endif /* EGL_NV_cuda_event */
+
 #ifndef EGL_NV_depth_nonlinear
 #define EGL_NV_depth_nonlinear 1
 #define EGL_DEPTH_ENCODING_NV             0x30E2
@@ -685,6 +908,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegion2NOK (EGLDisplay dpy, EGLSurfa
 #define EGL_DEPTH_ENCODING_NONLINEAR_NV   0x30E3
 #endif /* EGL_NV_depth_nonlinear */
 
+#ifndef EGL_NV_device_cuda
+#define EGL_NV_device_cuda 1
+#define EGL_CUDA_DEVICE_NV                0x323A
+#endif /* EGL_NV_device_cuda */
+
 #ifndef EGL_NV_native_query
 #define EGL_NV_native_query 1
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYNATIVEDISPLAYNVPROC) (EGLDisplay dpy, EGLNativeDisplayType *display_id);
@@ -710,6 +938,43 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur
 #endif
 #endif /* EGL_NV_post_sub_buffer */
 
+#ifndef EGL_NV_stream_consumer_gltexture_yuv
+#define EGL_NV_stream_consumer_gltexture_yuv 1
+#define EGL_YUV_PLANE0_TEXTURE_UNIT_NV    0x332C
+#define EGL_YUV_PLANE1_TEXTURE_UNIT_NV    0x332D
+#define EGL_YUV_PLANE2_TEXTURE_UNIT_NV    0x332E
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLAttrib *attrib_list);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, EGLAttrib *attrib_list);
+#endif
+#endif /* EGL_NV_stream_consumer_gltexture_yuv */
+
+#ifndef EGL_NV_stream_metadata
+#define EGL_NV_stream_metadata 1
+#define EGL_MAX_STREAM_METADATA_BLOCKS_NV 0x3250
+#define EGL_MAX_STREAM_METADATA_BLOCK_SIZE_NV 0x3251
+#define EGL_MAX_STREAM_METADATA_TOTAL_SIZE_NV 0x3252
+#define EGL_PRODUCER_METADATA_NV          0x3253
+#define EGL_CONSUMER_METADATA_NV          0x3254
+#define EGL_PENDING_METADATA_NV           0x3328
+#define EGL_METADATA0_SIZE_NV             0x3255
+#define EGL_METADATA1_SIZE_NV             0x3256
+#define EGL_METADATA2_SIZE_NV             0x3257
+#define EGL_METADATA3_SIZE_NV             0x3258
+#define EGL_METADATA0_TYPE_NV             0x3259
+#define EGL_METADATA1_TYPE_NV             0x325A
+#define EGL_METADATA2_TYPE_NV             0x325B
+#define EGL_METADATA3_TYPE_NV             0x325C
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBNVPROC) (EGLDisplay dpy, EGLint attribute, EGLAttrib *value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMMETADATANVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLint n, EGLint offset, EGLint size, const void *data);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMMETADATANVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum name, EGLint n, EGLint offset, EGLint size, void *data);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribNV (EGLDisplay dpy, EGLint attribute, EGLAttrib *value);
+EGLAPI EGLBoolean EGLAPIENTRY eglSetStreamMetadataNV (EGLDisplay dpy, EGLStreamKHR stream, EGLint n, EGLint offset, EGLint size, const void *data);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamMetadataNV (EGLDisplay dpy, EGLStreamKHR stream, EGLenum name, EGLint n, EGLint offset, EGLint size, void *data);
+#endif
+#endif /* EGL_NV_stream_metadata */
+
 #ifndef EGL_NV_stream_sync
 #define EGL_NV_stream_sync 1
 #define EGL_SYNC_NEW_FRAME_NV             0x321F
@@ -767,6 +1032,16 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void);
 #endif /* KHRONOS_SUPPORT_INT64 */
 #endif /* EGL_NV_system_time */
 
+#ifndef EGL_TIZEN_image_native_buffer
+#define EGL_TIZEN_image_native_buffer 1
+#define EGL_NATIVE_BUFFER_TIZEN           0x32A0
+#endif /* EGL_TIZEN_image_native_buffer */
+
+#ifndef EGL_TIZEN_image_native_surface
+#define EGL_TIZEN_image_native_surface 1
+#define EGL_NATIVE_SURFACE_TIZEN          0x32A1
+#endif /* EGL_TIZEN_image_native_surface */
+
 #ifdef __cplusplus
 }
 #endif
index 519df3e..6d550da 100644 (file)
@@ -25,7 +25,7 @@
 */
 
 /* Platform-specific types and definitions for egl.h
- * $Revision: 23432 $ on $Date: 2013-10-09 00:57:24 -0700 (Wed, 09 Oct 2013) $
+ * $Revision: 30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015) $
  *
  * Adopters may modify khrplatform.h and this file to suit their platform.
  * You are encouraged to submit all modifications to the Khronos group so that
@@ -99,6 +99,12 @@ typedef struct ANativeWindow*           EGLNativeWindowType;
 typedef struct egl_native_pixmap_t*     EGLNativePixmapType;
 typedef void*                           EGLNativeDisplayType;
 
+#elif defined(USE_OZONE)
+
+typedef intptr_t EGLNativeDisplayType;
+typedef intptr_t EGLNativeWindowType;
+typedef intptr_t EGLNativePixmapType;
+
 #elif defined(__unix__)
 
 /* X11 (tentative)  */
@@ -111,11 +117,15 @@ typedef Window   EGLNativeWindowType;
 
 #elif defined(__GNUC__) && ( defined(__APPLE_CPP__) || defined(__APPLE_CC__) || defined(__MACOS_CLASSIC__) )
 
-// TODO(jmadill): native implementation for OSX
+#if defined(__OBJC__)
+@class CALayer;
+#else
+class CALayer;
+#endif
 
 typedef void *EGLNativeDisplayType;
 typedef void *EGLNativePixmapType;
-typedef void *EGLNativeWindowType;
+typedef CALayer *EGLNativeWindowType;
 
 #else
 #error "Platform not recognized"
index 9ab5832..4d710c2 100644 (file)
@@ -1,56 +1,87 @@
 #ifndef __gl2_h_
-#define __gl2_h_
-
-/* $Revision: 20555 $ on $Date:: 2013-02-12 14:32:47 -0800 #$ */
-
-#include <GLES2/gl2platform.h>
+#define __gl2_h_ 1
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
+** Copyright (c) 2013-2015 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+/*
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
+** used to make the header, and the header can be found at
+**   http://www.opengl.org/registry/
+**
+** Khronos $Revision: 31811 $ on $Date: 2015-08-10 00:01:11 -0700 (Mon, 10 Aug 2015) $
+*/
 
-/*-------------------------------------------------------------------------
- * Data type definitions
- *-----------------------------------------------------------------------*/
+#include <GLES2/gl2platform.h>
 
-typedef void             GLvoid;
-typedef char             GLchar;
-typedef unsigned int     GLenum;
-typedef unsigned char    GLboolean;
-typedef unsigned int     GLbitfield;
-typedef khronos_int8_t   GLbyte;
-typedef short            GLshort;
-typedef int              GLint;
-typedef int              GLsizei;
-typedef khronos_uint8_t  GLubyte;
-typedef unsigned short   GLushort;
-typedef unsigned int     GLuint;
-typedef khronos_float_t  GLfloat;
-typedef khronos_float_t  GLclampf;
-typedef khronos_int32_t  GLfixed;
+#ifndef GL_APIENTRYP
+#define GL_APIENTRYP GL_APIENTRY*
+#endif
 
-/* GL types for handling large vertex buffer objects */
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
+/* Generated on date 20150809 */
 
-/* OpenGL ES core versions */
-#define GL_ES_VERSION_2_0                 1
+/* Generated C header for:
+ * API: gles2
+ * Profile: common
+ * Versions considered: 2\.[0-9]
+ * Versions emitted: .*
+ * Default extensions included: None
+ * Additional extensions included: _nomatch_^
+ * Extensions removed: _nomatch_^
+ */
 
-/* ClearBufferMask */
+#ifndef GL_ES_VERSION_2_0
+#define GL_ES_VERSION_2_0 1
+#include <KHR/khrplatform.h>
+typedef khronos_int8_t GLbyte;
+typedef khronos_float_t GLclampf;
+typedef khronos_int32_t GLfixed;
+typedef short GLshort;
+typedef unsigned short GLushort;
+typedef void GLvoid;
+typedef struct __GLsync *GLsync;
+typedef khronos_int64_t GLint64;
+typedef khronos_uint64_t GLuint64;
+typedef unsigned int GLenum;
+typedef unsigned int GLuint;
+typedef char GLchar;
+typedef khronos_float_t GLfloat;
+typedef khronos_ssize_t GLsizeiptr;
+typedef khronos_intptr_t GLintptr;
+typedef unsigned int GLbitfield;
+typedef int GLint;
+typedef unsigned char GLboolean;
+typedef int GLsizei;
+typedef khronos_uint8_t GLubyte;
 #define GL_DEPTH_BUFFER_BIT               0x00000100
 #define GL_STENCIL_BUFFER_BIT             0x00000400
 #define GL_COLOR_BUFFER_BIT               0x00004000
-
-/* Boolean */
 #define GL_FALSE                          0
 #define GL_TRUE                           1
-
-/* BeginMode */
 #define GL_POINTS                         0x0000
 #define GL_LINES                          0x0001
 #define GL_LINE_LOOP                      0x0002
@@ -58,18 +89,6 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_TRIANGLES                      0x0004
 #define GL_TRIANGLE_STRIP                 0x0005
 #define GL_TRIANGLE_FAN                   0x0006
-
-/* AlphaFunction (not supported in ES20) */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* BlendingFactorDest */
 #define GL_ZERO                           0
 #define GL_ONE                            1
 #define GL_SRC_COLOR                      0x0300
@@ -78,29 +97,15 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_ONE_MINUS_SRC_ALPHA            0x0303
 #define GL_DST_ALPHA                      0x0304
 #define GL_ONE_MINUS_DST_ALPHA            0x0305
-
-/* BlendingFactorSrc */
-/*      GL_ZERO */
-/*      GL_ONE */
 #define GL_DST_COLOR                      0x0306
 #define GL_ONE_MINUS_DST_COLOR            0x0307
 #define GL_SRC_ALPHA_SATURATE             0x0308
-/*      GL_SRC_ALPHA */
-/*      GL_ONE_MINUS_SRC_ALPHA */
-/*      GL_DST_ALPHA */
-/*      GL_ONE_MINUS_DST_ALPHA */
-
-/* BlendEquationSeparate */
 #define GL_FUNC_ADD                       0x8006
 #define GL_BLEND_EQUATION                 0x8009
-#define GL_BLEND_EQUATION_RGB             0x8009    /* same as BLEND_EQUATION */
+#define GL_BLEND_EQUATION_RGB             0x8009
 #define GL_BLEND_EQUATION_ALPHA           0x883D
-
-/* BlendSubtract */
 #define GL_FUNC_SUBTRACT                  0x800A
 #define GL_FUNC_REVERSE_SUBTRACT          0x800B
-
-/* Separate Blend Functions */
 #define GL_BLEND_DST_RGB                  0x80C8
 #define GL_BLEND_SRC_RGB                  0x80C9
 #define GL_BLEND_DST_ALPHA                0x80CA
@@ -110,38 +115,19 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_CONSTANT_ALPHA                 0x8003
 #define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
 #define GL_BLEND_COLOR                    0x8005
-
-/* Buffer Objects */
 #define GL_ARRAY_BUFFER                   0x8892
 #define GL_ELEMENT_ARRAY_BUFFER           0x8893
 #define GL_ARRAY_BUFFER_BINDING           0x8894
 #define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-
 #define GL_STREAM_DRAW                    0x88E0
 #define GL_STATIC_DRAW                    0x88E4
 #define GL_DYNAMIC_DRAW                   0x88E8
-
 #define GL_BUFFER_SIZE                    0x8764
 #define GL_BUFFER_USAGE                   0x8765
-
 #define GL_CURRENT_VERTEX_ATTRIB          0x8626
-
-/* CullFaceMode */
 #define GL_FRONT                          0x0404
 #define GL_BACK                           0x0405
 #define GL_FRONT_AND_BACK                 0x0408
-
-/* DepthFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* EnableCap */
 #define GL_TEXTURE_2D                     0x0DE1
 #define GL_CULL_FACE                      0x0B44
 #define GL_BLEND                          0x0BE2
@@ -152,19 +138,13 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_POLYGON_OFFSET_FILL            0x8037
 #define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
 #define GL_SAMPLE_COVERAGE                0x80A0
-
-/* ErrorCode */
 #define GL_NO_ERROR                       0
 #define GL_INVALID_ENUM                   0x0500
 #define GL_INVALID_VALUE                  0x0501
 #define GL_INVALID_OPERATION              0x0502
 #define GL_OUT_OF_MEMORY                  0x0505
-
-/* FrontFaceDirection */
 #define GL_CW                             0x0900
 #define GL_CCW                            0x0901
-
-/* GetPName */
 #define GL_LINE_WIDTH                     0x0B21
 #define GL_ALIASED_POINT_SIZE_RANGE       0x846D
 #define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
@@ -191,7 +171,6 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_STENCIL_BACK_WRITEMASK         0x8CA5
 #define GL_VIEWPORT                       0x0BA2
 #define GL_SCISSOR_BOX                    0x0C10
-/*      GL_SCISSOR_TEST */
 #define GL_COLOR_CLEAR_VALUE              0x0C22
 #define GL_COLOR_WRITEMASK                0x0C23
 #define GL_UNPACK_ALIGNMENT               0x0CF5
@@ -206,32 +185,18 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_DEPTH_BITS                     0x0D56
 #define GL_STENCIL_BITS                   0x0D57
 #define GL_POLYGON_OFFSET_UNITS           0x2A00
-/*      GL_POLYGON_OFFSET_FILL */
 #define GL_POLYGON_OFFSET_FACTOR          0x8038
 #define GL_TEXTURE_BINDING_2D             0x8069
 #define GL_SAMPLE_BUFFERS                 0x80A8
 #define GL_SAMPLES                        0x80A9
 #define GL_SAMPLE_COVERAGE_VALUE          0x80AA
 #define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-
-/* GetTextureParameter */
-/*      GL_TEXTURE_MAG_FILTER */
-/*      GL_TEXTURE_MIN_FILTER */
-/*      GL_TEXTURE_WRAP_S */
-/*      GL_TEXTURE_WRAP_T */
-
 #define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
 #define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-
-/* HintMode */
 #define GL_DONT_CARE                      0x1100
 #define GL_FASTEST                        0x1101
 #define GL_NICEST                         0x1102
-
-/* HintTarget */
-#define GL_GENERATE_MIPMAP_HINT            0x8192
-
-/* DataType */
+#define GL_GENERATE_MIPMAP_HINT           0x8192
 #define GL_BYTE                           0x1400
 #define GL_UNSIGNED_BYTE                  0x1401
 #define GL_SHORT                          0x1402
@@ -240,44 +205,35 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_UNSIGNED_INT                   0x1405
 #define GL_FLOAT                          0x1406
 #define GL_FIXED                          0x140C
-
-/* PixelFormat */
 #define GL_DEPTH_COMPONENT                0x1902
 #define GL_ALPHA                          0x1906
 #define GL_RGB                            0x1907
 #define GL_RGBA                           0x1908
 #define GL_LUMINANCE                      0x1909
 #define GL_LUMINANCE_ALPHA                0x190A
-
-/* PixelType */
-/*      GL_UNSIGNED_BYTE */
 #define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
 #define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
 #define GL_UNSIGNED_SHORT_5_6_5           0x8363
-
-/* Shaders */
-#define GL_FRAGMENT_SHADER                  0x8B30
-#define GL_VERTEX_SHADER                    0x8B31
-#define GL_MAX_VERTEX_ATTRIBS               0x8869
-#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
-#define GL_MAX_VARYING_VECTORS              0x8DFC
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
+#define GL_MAX_VARYING_VECTORS            0x8DFC
 #define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS   0x8B4C
-#define GL_MAX_TEXTURE_IMAGE_UNITS          0x8872
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
-#define GL_SHADER_TYPE                      0x8B4F
-#define GL_DELETE_STATUS                    0x8B80
-#define GL_LINK_STATUS                      0x8B82
-#define GL_VALIDATE_STATUS                  0x8B83
-#define GL_ATTACHED_SHADERS                 0x8B85
-#define GL_ACTIVE_UNIFORMS                  0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH        0x8B87
-#define GL_ACTIVE_ATTRIBUTES                0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH      0x8B8A
-#define GL_SHADING_LANGUAGE_VERSION         0x8B8C
-#define GL_CURRENT_PROGRAM                  0x8B8D
-
-/* StencilFunction */
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
 #define GL_NEVER                          0x0200
 #define GL_LESS                           0x0201
 #define GL_EQUAL                          0x0202
@@ -286,9 +242,6 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_NOTEQUAL                       0x0205
 #define GL_GEQUAL                         0x0206
 #define GL_ALWAYS                         0x0207
-
-/* StencilOp */
-/*      GL_ZERO */
 #define GL_KEEP                           0x1E00
 #define GL_REPLACE                        0x1E01
 #define GL_INCR                           0x1E02
@@ -296,35 +249,21 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_INVERT                         0x150A
 #define GL_INCR_WRAP                      0x8507
 #define GL_DECR_WRAP                      0x8508
-
-/* StringName */
 #define GL_VENDOR                         0x1F00
 #define GL_RENDERER                       0x1F01
 #define GL_VERSION                        0x1F02
 #define GL_EXTENSIONS                     0x1F03
-
-/* TextureMagFilter */
 #define GL_NEAREST                        0x2600
 #define GL_LINEAR                         0x2601
-
-/* TextureMinFilter */
-/*      GL_NEAREST */
-/*      GL_LINEAR */
 #define GL_NEAREST_MIPMAP_NEAREST         0x2700
 #define GL_LINEAR_MIPMAP_NEAREST          0x2701
 #define GL_NEAREST_MIPMAP_LINEAR          0x2702
 #define GL_LINEAR_MIPMAP_LINEAR           0x2703
-
-/* TextureParameterName */
 #define GL_TEXTURE_MAG_FILTER             0x2800
 #define GL_TEXTURE_MIN_FILTER             0x2801
 #define GL_TEXTURE_WRAP_S                 0x2802
 #define GL_TEXTURE_WRAP_T                 0x2803
-
-/* TextureTarget */
-/*      GL_TEXTURE_2D */
 #define GL_TEXTURE                        0x1702
-
 #define GL_TEXTURE_CUBE_MAP               0x8513
 #define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
 #define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
@@ -334,8 +273,6 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
 #define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
 #define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-
-/* TextureUnit */
 #define GL_TEXTURE0                       0x84C0
 #define GL_TEXTURE1                       0x84C1
 #define GL_TEXTURE2                       0x84C2
@@ -369,13 +306,9 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_TEXTURE30                      0x84DE
 #define GL_TEXTURE31                      0x84DF
 #define GL_ACTIVE_TEXTURE                 0x84E0
-
-/* TextureWrapMode */
 #define GL_REPEAT                         0x2901
 #define GL_CLAMP_TO_EDGE                  0x812F
 #define GL_MIRRORED_REPEAT                0x8370
-
-/* Uniform Types */
 #define GL_FLOAT_VEC2                     0x8B50
 #define GL_FLOAT_VEC3                     0x8B51
 #define GL_FLOAT_VEC4                     0x8B52
@@ -391,48 +324,34 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_FLOAT_MAT4                     0x8B5C
 #define GL_SAMPLER_2D                     0x8B5E
 #define GL_SAMPLER_CUBE                   0x8B60
-
-/* Vertex Arrays */
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED        0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE           0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE         0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE           0x8625
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED     0x886A
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER        0x8645
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
 #define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-
-/* Read Format */
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE   0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
 #define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-
-/* Shader Source */
 #define GL_COMPILE_STATUS                 0x8B81
 #define GL_INFO_LOG_LENGTH                0x8B84
 #define GL_SHADER_SOURCE_LENGTH           0x8B88
 #define GL_SHADER_COMPILER                0x8DFA
-
-/* Shader Binary */
 #define GL_SHADER_BINARY_FORMATS          0x8DF8
 #define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
-
-/* Shader Precision-Specified Types */
 #define GL_LOW_FLOAT                      0x8DF0
 #define GL_MEDIUM_FLOAT                   0x8DF1
 #define GL_HIGH_FLOAT                     0x8DF2
 #define GL_LOW_INT                        0x8DF3
 #define GL_MEDIUM_INT                     0x8DF4
 #define GL_HIGH_INT                       0x8DF5
-
-/* Framebuffer Object. */
 #define GL_FRAMEBUFFER                    0x8D40
 #define GL_RENDERBUFFER                   0x8D41
-
 #define GL_RGBA4                          0x8056
 #define GL_RGB5_A1                        0x8057
 #define GL_RGB565                         0x8D62
 #define GL_DEPTH_COMPONENT16              0x81A5
 #define GL_STENCIL_INDEX8                 0x8D48
-
 #define GL_RENDERBUFFER_WIDTH             0x8D42
 #define GL_RENDERBUFFER_HEIGHT            0x8D43
 #define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
@@ -442,185 +361,319 @@ typedef khronos_ssize_t  GLsizeiptr;
 #define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
 #define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
 #define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE           0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME           0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL         0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-
 #define GL_COLOR_ATTACHMENT0              0x8CE0
 #define GL_DEPTH_ATTACHMENT               0x8D00
 #define GL_STENCIL_ATTACHMENT             0x8D20
-
 #define GL_NONE                           0
-
-#define GL_FRAMEBUFFER_COMPLETE                      0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         0x8CD6
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
 #define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         0x8CD9
-#define GL_FRAMEBUFFER_UNSUPPORTED                   0x8CDD
-
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
 #define GL_FRAMEBUFFER_BINDING            0x8CA6
 #define GL_RENDERBUFFER_BINDING           0x8CA7
 #define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-
 #define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-
-/*-------------------------------------------------------------------------
- * GL core functions.
- *-----------------------------------------------------------------------*/
+typedef void (GL_APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (GL_APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (GL_APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (GL_APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (GL_APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (GL_APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (GL_APIENTRYP PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture);
+typedef void (GL_APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (GL_APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor);
+typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (GL_APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (GL_APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+typedef GLenum (GL_APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (GL_APIENTRYP PFNGLCLEARPROC) (GLbitfield mask);
+typedef void (GL_APIENTRYP PFNGLCLEARCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+typedef void (GL_APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
+typedef void (GL_APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s);
+typedef void (GL_APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+typedef void (GL_APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (GL_APIENTRYP PFNGLCOPYTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef GLuint (GL_APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (GL_APIENTRYP PFNGLCULLFACEPROC) (GLenum mode);
+typedef void (GL_APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (GL_APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (GL_APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (GL_APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (GL_APIENTRYP PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures);
+typedef void (GL_APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func);
+typedef void (GL_APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag);
+typedef void (GL_APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
+typedef void (GL_APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (GL_APIENTRYP PFNGLDISABLEPROC) (GLenum cap);
+typedef void (GL_APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices);
+typedef void (GL_APIENTRYP PFNGLENABLEPROC) (GLenum cap);
+typedef void (GL_APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (GL_APIENTRYP PFNGLFINISHPROC) (void);
+typedef void (GL_APIENTRYP PFNGLFLUSHPROC) (void);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GL_APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode);
+typedef void (GL_APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef void (GL_APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (GL_APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef void (GL_APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (GL_APIENTRYP PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
+typedef void (GL_APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (GL_APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+typedef GLint (GL_APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (GL_APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *data);
+typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLenum (GL_APIENTRYP PFNGLGETERRORPROC) (void);
+typedef void (GL_APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *data);
+typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *data);
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (GL_APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+typedef void (GL_APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef const GLubyte *(GL_APIENTRYP PFNGLGETSTRINGPROC) (GLenum name);
+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (GL_APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef GLint (GL_APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef void (GL_APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode);
+typedef GLboolean (GL_APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef GLboolean (GL_APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
+typedef GLboolean (GL_APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (GL_APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef GLboolean (GL_APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef GLboolean (GL_APIENTRYP PFNGLISTEXTUREPROC) (GLuint texture);
+typedef void (GL_APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width);
+typedef void (GL_APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (GL_APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param);
+typedef void (GL_APIENTRYP PFNGLPOLYGONOFFSETPROC) (GLfloat factor, GLfloat units);
+typedef void (GL_APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
+typedef void (GL_APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
+typedef void (GL_APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+typedef void (GL_APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+typedef void (GL_APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask);
+typedef void (GL_APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
+typedef void (GL_APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask);
+typedef void (GL_APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (GL_APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass);
+typedef void (GL_APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (GL_APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (GL_APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (GL_APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (GL_APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (GL_APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (GL_APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (GL_APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (GL_APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (GL_APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (GL_APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
 
 #if defined(_MSC_VER) && !defined(ANGLE_WEBKIT_WIN)
 #include <GLES2/gl2softlinking.h>
 #else
 
-GL_APICALL void         GL_APIENTRY glActiveTexture (GLenum texture);
-GL_APICALL void         GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
-GL_APICALL void         GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name);
-GL_APICALL void         GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GL_APICALL void         GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
-GL_APICALL void         GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
-GL_APICALL void         GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
-GL_APICALL void         GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GL_APICALL void         GL_APIENTRY glBlendEquation ( GLenum mode );
-GL_APICALL void         GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
-GL_APICALL void         GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
-GL_APICALL void         GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-GL_APICALL void         GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
-GL_APICALL void         GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
-GL_APICALL GLenum       GL_APIENTRY glCheckFramebufferStatus (GLenum target);
-GL_APICALL void         GL_APIENTRY glClear (GLbitfield mask);
-GL_APICALL void         GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GL_APICALL void         GL_APIENTRY glClearDepthf (GLclampf depth);
-GL_APICALL void         GL_APIENTRY glClearStencil (GLint s);
-GL_APICALL void         GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GL_APICALL void         GL_APIENTRY glCompileShader (GLuint shader);
-GL_APICALL void         GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void         GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void         GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GL_APICALL void         GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL GLuint       GL_APIENTRY glCreateProgram (void);
-GL_APICALL GLuint       GL_APIENTRY glCreateShader (GLenum type);
-GL_APICALL void         GL_APIENTRY glCullFace (GLenum mode);
-GL_APICALL void         GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers);
-GL_APICALL void         GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers);
-GL_APICALL void         GL_APIENTRY glDeleteProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers);
-GL_APICALL void         GL_APIENTRY glDeleteShader (GLuint shader);
-GL_APICALL void         GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures);
-GL_APICALL void         GL_APIENTRY glDepthFunc (GLenum func);
-GL_APICALL void         GL_APIENTRY glDepthMask (GLboolean flag);
-GL_APICALL void         GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar);
-GL_APICALL void         GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
-GL_APICALL void         GL_APIENTRY glDisable (GLenum cap);
-GL_APICALL void         GL_APIENTRY glDisableVertexAttribArray (GLuint index);
-GL_APICALL void         GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
-GL_APICALL void         GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices);
-GL_APICALL void         GL_APIENTRY glEnable (GLenum cap);
-GL_APICALL void         GL_APIENTRY glEnableVertexAttribArray (GLuint index);
-GL_APICALL void         GL_APIENTRY glFinish (void);
-GL_APICALL void         GL_APIENTRY glFlush (void);
-GL_APICALL void         GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GL_APICALL void         GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GL_APICALL void         GL_APIENTRY glFrontFace (GLenum mode);
-GL_APICALL void         GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers);
-GL_APICALL void         GL_APIENTRY glGenerateMipmap (GLenum target);
-GL_APICALL void         GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers);
-GL_APICALL void         GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers);
-GL_APICALL void         GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
-GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
-GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
-GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-GL_APICALL GLint        GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
-GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
-GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL GLenum       GL_APIENTRY glGetError (void);
-GL_APICALL void         GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog);
-GL_APICALL void         GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog);
-GL_APICALL void         GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
-GL_APICALL void         GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source);
-GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name);
-GL_APICALL void         GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
-GL_APICALL GLint        GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
-GL_APICALL void         GL_APIENTRY glHint (GLenum target, GLenum mode);
-GL_APICALL GLboolean    GL_APIENTRY glIsBuffer (GLuint buffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsEnabled (GLenum cap);
-GL_APICALL GLboolean    GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsProgram (GLuint program);
-GL_APICALL GLboolean    GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsShader (GLuint shader);
-GL_APICALL GLboolean    GL_APIENTRY glIsTexture (GLuint texture);
-GL_APICALL void         GL_APIENTRY glLineWidth (GLfloat width);
-GL_APICALL void         GL_APIENTRY glLinkProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
-GL_APICALL void         GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-GL_APICALL void         GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format,