gecko-dev/gfx/angle/README.mozilla

49 строки
1.8 KiB
Plaintext
Исходник Обычный вид История

b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
This is the ANGLE project, originally from https://chromium.googlesource.com/angle/angle
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
The Mozilla upstream is the 'mozilla' branch from https://github.com/mozilla/angle, which
includes Mozilla-specific patches on top of upstream.
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
=== How to upgrade ANGLE ===
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
1. git clone https://github.com/mozilla/angle angle
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
2. Go into the angle dir, and add the google upstream as a remote:
git remote add google https://chromium.googlesource.com/angle/angle
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
3. Fetch the new google upstream:
git fetch google
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
4. Switch to the mozilla branch
git checkout mozilla
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
5. Rebase the mozilla branch on top of the new google master. Fix up patches along the way,
remove unneded commits. Google seems to have "chromium/2059" branches as well, that I
assume are merges into the Chromium tree. These might be a good point to rebase on
as well, instead of google/master:
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
git rebase -i google/master
or git rebase -i google/chromium/2081 (whatever the latest is in 'git branch -a')
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
6. Re-generate moz.build files:
./gyp_mozbuild
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
7. nuke mozilla-central/gfx/angle directory
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
8. copy all the relevant files from the github checkout
cd mozilla-central
mkdir gfx/angle
cp -r /c/proj/angle/[A-Z]* /c/proj/angle/{include,src,moz.build} gfx/angle
b=1010371; Update ANGLE; r=upstream --HG-- rename : gfx/angle/src/compiler/64bit-lexer-safety.patch => gfx/angle/src/compiler/translator/64bit-lexer-safety.patch rename : gfx/angle/src/compiler/ExtensionBehavior.h => gfx/angle/src/compiler/translator/ExtensionBehavior.h rename : gfx/angle/src/compiler/InitializeDll.h => gfx/angle/src/compiler/translator/InitializeDll.h rename : gfx/angle/src/compiler/InitializeGlobals.h => gfx/angle/src/compiler/translator/InitializeGlobals.h rename : gfx/angle/src/compiler/InitializeParseContext.h => gfx/angle/src/compiler/translator/InitializeParseContext.h rename : gfx/angle/src/compiler/MMap.h => gfx/angle/src/compiler/translator/MMap.h rename : gfx/angle/src/compiler/PoolAlloc.h => gfx/angle/src/compiler/translator/PoolAlloc.h rename : gfx/angle/src/compiler/Pragma.h => gfx/angle/src/compiler/translator/Pragma.h rename : gfx/angle/src/compiler/QualifierAlive.h => gfx/angle/src/compiler/translator/QualifierAlive.h rename : gfx/angle/src/compiler/RemoveTree.h => gfx/angle/src/compiler/translator/RemoveTree.h rename : gfx/angle/src/compiler/generate_parser.sh => gfx/angle/src/compiler/translator/generate_parser.sh rename : gfx/angle/src/compiler/glslang.h => gfx/angle/src/compiler/translator/glslang.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer11.h => gfx/angle/src/libGLESv2/renderer/d3d11/IndexBuffer11.h rename : gfx/angle/src/libGLESv2/renderer/IndexBuffer9.h => gfx/angle/src/libGLESv2/renderer/d3d9/IndexBuffer9.h rename : gfx/angle/src/libGLESv2/renderer/ShaderExecutable9.h => gfx/angle/src/libGLESv2/renderer/d3d9/ShaderExecutable9.h rename : gfx/angle/src/libGLESv2/renderer/SwapChain9.h => gfx/angle/src/libGLESv2/renderer/d3d9/SwapChain9.h rename : gfx/angle/src/libGLESv2/renderer/VertexDeclarationCache.h => gfx/angle/src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h rename : gfx/angle/src/libGLESv2/renderer/shaders/Blit.vs => gfx/angle/src/libGLESv2/renderer/d3d9/shaders/Blit.vs
2014-07-04 19:49:25 +04:00
9. Build. Fix things until it builds.
10. Try runs and reviews!
11. Once reviews are done and checkin is ready, tag the equivalent git repo:
git tag -a mozilla-bug-123456 -m "ANGLE update for bug 123456"
12. Push the new mozilla branch, along with the tags upstream:
git push --tags mozilla +mozilla
The "mozilla" branch head will keep moving, since it will keep getting rebased.
The tags will point to the topmost commit that was used for a particular bug number,
so that we can see its history if needed.