From ea77ce228a6543cb2da2e537702941046bbb16a4 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Mon, 16 Jun 2014 13:20:17 -0400 Subject: Fix buffer overflow error on buffer resize. We were using the new, larger size for our buffer data copy step, instead of the old, smaller size. This bug was causing a crash on older nVidia drivers during normal browser usage. Reproducible with the index-validation-large-buffer WebGL test. BUG=angle:667 BUG=384420 Change-Id: I98ee893e0d8ba0bfc9adfe5a338da9b940248879 Reviewed-on: https://chromium-review.googlesource.com/203776 Tested-by: Jamie Madill Reviewed-by: Shannon Woods Reviewed-by: Geoff Lang Reviewed-on: https://chromium-review.googlesource.com/207122 Reviewed-by: Nicolas Capens --- src/libGLESv2/renderer/d3d11/BufferStorage11.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libGLESv2/renderer/d3d11/BufferStorage11.cpp b/src/libGLESv2/renderer/d3d11/BufferStorage11.cpp index c0f8e00d..5109779e 100644 --- a/src/libGLESv2/renderer/d3d11/BufferStorage11.cpp +++ b/src/libGLESv2/renderer/d3d11/BufferStorage11.cpp @@ -646,9 +646,12 @@ bool BufferStorage11::NativeBuffer11::resize(size_t size, bool preserveData) if (mNativeBuffer && preserveData) { + // We don't call resize if the buffer is big enough already. + ASSERT(mBufferSize <= size); + D3D11_BOX srcBox; srcBox.left = 0; - srcBox.right = size; + srcBox.right = mBufferSize; srcBox.top = 0; srcBox.bottom = 1; srcBox.front = 0; -- cgit v1.2.3 From a1bb2d5a6cb8d0738195e8396801721ba6570f6d Mon Sep 17 00:00:00 2001 From: Nicolas Capens Date: Fri, 6 Jun 2014 15:18:07 -0400 Subject: Restrict the size of shader arrays. This prevents overflow issues in the HLSL translator and some drivers. The limit it hard-coded to 65536 to be larger than the Shader Model 5 register limit (4096) to account for register allocation optimizations and future hardware. BUG=379799 Change-Id: I20f05c9dd230fbfc1c92af52533cd2b50f2ff994 Reviewed-on: https://chromium-review.googlesource.com/202939 Reviewed-by: Jamie Madill Reviewed-by: Shannon Woods Tested-by: Nicolas Capens Reviewed-on: https://chromium-review.googlesource.com/207123 Reviewed-by: Nicolas Capens Reviewed-by: Geoff Lang Tested-by: Jamie Madill --- src/compiler/translator/ParseContext.cpp | 38 +++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp index eac8f2c7..f9009668 100644 --- a/src/compiler/translator/ParseContext.cpp +++ b/src/compiler/translator/ParseContext.cpp @@ -701,28 +701,44 @@ bool TParseContext::arraySizeErrorCheck(const TSourceLoc& line, TIntermTyped* ex return true; } + unsigned int unsignedSize = 0; + if (constant->getBasicType() == EbtUInt) { - unsigned int uintSize = constant->getUConst(0); - if (uintSize > static_cast(std::numeric_limits::max())) - { - error(line, "array size too large", ""); - size = 1; - return true; - } - - size = static_cast(uintSize); + unsignedSize = constant->getUConst(0); + size = static_cast(unsignedSize); } else { size = constant->getIConst(0); - if (size <= 0) + if (size < 0) { - error(line, "array size must be a positive integer", ""); + error(line, "array size must be non-negative", ""); size = 1; return true; } + + unsignedSize = static_cast(size); + } + + if (size == 0) + { + error(line, "array size must be greater than zero", ""); + size = 1; + return true; + } + + // The size of arrays is restricted here to prevent issues further down the + // compiler/translator/driver stack. Shader Model 5 generation hardware is limited to + // 4096 registers so this should be reasonable even for aggressively optimizable code. + const unsigned int sizeLimit = 65536; + + if (unsignedSize > sizeLimit) + { + error(line, "array size too large", ""); + size = 1; + return true; } return false; -- cgit v1.2.3 From b3319dfe5757480b25c892634d11a252deefa789 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Mon, 23 Jun 2014 10:53:54 -0400 Subject: Fix npot Texture level 0 validation. We were rejecting npot textures for level 0, even though it is valid in GLES 2 for non-mipped textures to have npot size. BUG=381495 Change-Id: Iacc3ab50d6487ecba804fd8963aa0a2ada2f1cae Reviewed-on: https://chromium-review.googlesource.com/205220 Reviewed-by: Geoff Lang Tested-by: Jamie Madill Reviewed-by: Nicolas Capens Change-Id: Iad3f5d007e878e60a87180bba3a2c1e246c311ca Reviewed-on: https://chromium-review.googlesource.com/207121 Reviewed-by: Nicolas Capens --- src/libGLESv2/validationES.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libGLESv2/validationES.cpp b/src/libGLESv2/validationES.cpp index e44a0f75..03b8f71b 100644 --- a/src/libGLESv2/validationES.cpp +++ b/src/libGLESv2/validationES.cpp @@ -166,14 +166,16 @@ bool ValidMipLevel(const Context *context, GLenum target, GLint level) return level < maxLevel; } -bool ValidImageSize(const gl::Context *context, GLenum target, GLint level, GLsizei width, GLsizei height, GLsizei depth) +bool ValidImageSize(const gl::Context *context, GLenum target, GLint level, + GLsizei width, GLsizei height, GLsizei depth) { if (level < 0 || width < 0 || height < 0 || depth < 0) { return false; } - if (!context->supportsNonPower2Texture() && (level != 0 || !gl::isPow2(width) || !gl::isPow2(height) || !gl::isPow2(depth))) + if (!context->supportsNonPower2Texture() && + (level != 0 && (!gl::isPow2(width) || !gl::isPow2(height) || !gl::isPow2(depth)))) { return false; } -- cgit v1.2.3 From 5ec99a794952ac04e89bac86b3a6acc50667be71 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Wed, 26 Feb 2014 09:47:11 -0500 Subject: Fix not rewriting else-if blocks. We would miss expanding the else-if clauses in a chain of selection statements. BUG=346463 BUG=391697 Change-Id: Iee644b875cf68d0ed3dc0b73542efc49ecb23242 Reviewed-on: https://chromium-review.googlesource.com/206822 Reviewed-by: Nicolas Capens Tested-by: Jamie Madill Reviewed-by: Shannon Woods Reviewed-on: https://chromium-review.googlesource.com/207832 --- src/compiler/translator/RewriteElseBlocks.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/compiler/translator/RewriteElseBlocks.cpp b/src/compiler/translator/RewriteElseBlocks.cpp index 48e87cd5..8a9e29e6 100644 --- a/src/compiler/translator/RewriteElseBlocks.cpp +++ b/src/compiler/translator/RewriteElseBlocks.cpp @@ -48,6 +48,14 @@ bool ElseBlockRewriter::visitAggregate(Visit visit, TIntermAggregate *node) TIntermSelection *selection = statement->getAsSelectionNode(); if (selection && selection->getFalseBlock() != NULL) { + // Check for if / else if + TIntermSelection *elseIfBranch = selection->getFalseBlock()->getAsSelectionNode(); + if (elseIfBranch) + { + selection->replaceChildNode(elseIfBranch, rewriteSelection(elseIfBranch)); + delete elseIfBranch; + } + node->getSequence()[statementIndex] = rewriteSelection(selection); delete selection; } -- cgit v1.2.3 From 9093114b5502f732727aac41e456d0cfbc092c5a Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Mon, 7 Jul 2014 12:49:23 -0400 Subject: Add a new TIntermRaw node type to translator. This raw node stores text strings that we directly copy to the output. This allows for more tricky substitutions that don't fit in to the HLSL/GLSL shared parsing model. BUG=346463 BUG=391697 Change-Id: Ibbde6db4fc98ef6d892f219631ca1a258a902a86 Reviewed-on: https://chromium-review.googlesource.com/206823 Tested-by: Jamie Madill Reviewed-by: Nicolas Capens Reviewed-by: Shannon Woods Reviewed-on: https://chromium-review.googlesource.com/207833 --- src/compiler/translator/IntermTraverse.cpp | 4 ++++ src/compiler/translator/OutputHLSL.cpp | 5 +++++ src/compiler/translator/OutputHLSL.h | 1 + src/compiler/translator/intermediate.h | 26 ++++++++++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/src/compiler/translator/IntermTraverse.cpp b/src/compiler/translator/IntermTraverse.cpp index a5794880..69f87c32 100644 --- a/src/compiler/translator/IntermTraverse.cpp +++ b/src/compiler/translator/IntermTraverse.cpp @@ -257,3 +257,7 @@ void TIntermBranch::traverse(TIntermTraverser *it) it->visitBranch(PostVisit, this); } +void TIntermRaw::traverse(TIntermTraverser *it) +{ + it->visitRaw(this); +} diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp index ea0045f0..5520c861 100644 --- a/src/compiler/translator/OutputHLSL.cpp +++ b/src/compiler/translator/OutputHLSL.cpp @@ -1850,6 +1850,11 @@ void OutputHLSL::visitSymbol(TIntermSymbol *node) } } +void OutputHLSL::visitRaw(TIntermRaw *node) +{ + mBody << node->getRawText(); +} + bool OutputHLSL::visitBinary(Visit visit, TIntermBinary *node) { TInfoSinkBase &out = mBody; diff --git a/src/compiler/translator/OutputHLSL.h b/src/compiler/translator/OutputHLSL.h index f681b716..ab5a90be 100644 --- a/src/compiler/translator/OutputHLSL.h +++ b/src/compiler/translator/OutputHLSL.h @@ -55,6 +55,7 @@ class OutputHLSL : public TIntermTraverser // Visit AST nodes and output their code to the body stream void visitSymbol(TIntermSymbol*); + void visitRaw(TIntermRaw*); void visitConstantUnion(TIntermConstantUnion*); bool visitBinary(Visit visit, TIntermBinary*); bool visitUnary(Visit visit, TIntermUnary*); diff --git a/src/compiler/translator/intermediate.h b/src/compiler/translator/intermediate.h index 7c72099f..2fdde02e 100644 --- a/src/compiler/translator/intermediate.h +++ b/src/compiler/translator/intermediate.h @@ -211,6 +211,7 @@ class TIntermTyped; class TIntermSymbol; class TIntermLoop; class TInfoSink; +class TIntermRaw; // // Base class for the tree nodes @@ -238,6 +239,7 @@ public: virtual TIntermSelection* getAsSelectionNode() { return 0; } virtual TIntermSymbol* getAsSymbolNode() { return 0; } virtual TIntermLoop* getAsLoopNode() { return 0; } + virtual TIntermRaw* getAsRawNode() { return 0; } // Replace a child node. Return true if |original| is a child // node and it is replaced; otherwise, return false. @@ -397,6 +399,29 @@ protected: TString symbol; }; +// A Raw node stores raw code, that the translator will insert verbatim +// into the output stream. Useful for transformation operations that make +// complex code that might not fit naturally into the GLSL model. +class TIntermRaw : public TIntermTyped { +public: + TIntermRaw(const TType &t, const TString &rawTextIn) + : TIntermTyped(t), rawText(rawTextIn) + {} + + virtual bool hasSideEffects() const { return false; } + + TString getRawText() const { return rawText; } + + virtual void traverse(TIntermTraverser*); + + virtual TIntermRaw* getAsRawNode() { return this; } + virtual bool replaceChildNode(TIntermNode *, TIntermNode *) { return false; } + virtual void enqueueChildren(std::queue *nodeQueue) const {} + +protected: + TString rawText; +}; + class TIntermConstantUnion : public TIntermTyped { public: TIntermConstantUnion(ConstantUnion *unionPointer, const TType& t) : TIntermTyped(t), unionArrayPointer(unionPointer) { } @@ -619,6 +644,7 @@ public: virtual ~TIntermTraverser() {} virtual void visitSymbol(TIntermSymbol*) {} + virtual void visitRaw(TIntermRaw*) {} virtual void visitConstantUnion(TIntermConstantUnion*) {} virtual bool visitBinary(Visit visit, TIntermBinary*) {return true;} virtual bool visitUnary(Visit visit, TIntermUnary*) {return true;} -- cgit v1.2.3 From ebba7d306b34a56f57ff1b87682bdc67cc9c50f8 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Mon, 7 Jul 2014 12:49:45 -0400 Subject: Fix HLSL compiler error with else-rewriting in functions. In functions with return types where we would use if-else rewriting, we would potentially generate a spurious HLSL error that warned of branches with no return value in the function. This was causing a maps regression where overlays would not draw in Earth mode. BUG=346463 BUG=391697 Change-Id: I9f4fa959057a3a2dab6cdd98f8381b5871cabf03 Reviewed-on: https://chromium-review.googlesource.com/206824 Tested-by: Jamie Madill Reviewed-by: Nicolas Capens Reviewed-by: Shannon Woods Reviewed-on: https://chromium-review.googlesource.com/207834 --- src/compiler/translator/RewriteElseBlocks.cpp | 28 ++++++++++++++++++++++++++- src/compiler/translator/RewriteElseBlocks.h | 6 ++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/compiler/translator/RewriteElseBlocks.cpp b/src/compiler/translator/RewriteElseBlocks.cpp index 8a9e29e6..46e510c3 100644 --- a/src/compiler/translator/RewriteElseBlocks.cpp +++ b/src/compiler/translator/RewriteElseBlocks.cpp @@ -36,11 +36,18 @@ TIntermUnary *MakeNewUnary(TOperator op, TIntermTyped *operand) return unary; } +ElseBlockRewriter::ElseBlockRewriter() + : TIntermTraverser(true, false, true, false), + mTemporaryIndex(0), + mFunctionType(NULL) +{} + bool ElseBlockRewriter::visitAggregate(Visit visit, TIntermAggregate *node) { switch (node->getOp()) { case EOpSequence: + if (visit == PostVisit) { for (size_t statementIndex = 0; statementIndex != node->getSequence().size(); statementIndex++) { @@ -63,6 +70,11 @@ bool ElseBlockRewriter::visitAggregate(Visit visit, TIntermAggregate *node) } break; + case EOpFunction: + // Store the current function context (see comment below) + mFunctionType = ((visit == PreVisit) ? &node->getType() : NULL); + break; + default: break; } @@ -82,8 +94,22 @@ TIntermNode *ElseBlockRewriter::rewriteSelection(TIntermSelection *selection) TIntermBinary *storeCondition = MakeNewBinary(EOpInitialize, conditionSymbolA, typedCondition, resultType); TIntermUnary *negatedCondition = MakeNewUnary(EOpLogicalNot, conditionSymbolB); + TIntermNode *negatedElse = NULL; + + // crbug.com/346463 + // D3D generates error messages claiming a function has no return value, when rewriting + // an if-else clause that returns something non-void in a function. By appending dummy + // returns (that are unreachable) we can silence this compile error. + if (mFunctionType && mFunctionType->getBasicType() != EbtVoid) + { + TString typeString = mFunctionType->getStruct() ? mFunctionType->getStruct()->name() : + mFunctionType->getBasicString(); + TString rawText = "return (" + typeString + ")0"; + negatedElse = new TIntermRaw(*mFunctionType, rawText); + } + TIntermSelection *falseBlock = new TIntermSelection(negatedCondition, - selection->getFalseBlock(), NULL); + selection->getFalseBlock(), negatedElse); TIntermSelection *newIfElse = new TIntermSelection(conditionSymbolC, selection->getTrueBlock(), falseBlock); diff --git a/src/compiler/translator/RewriteElseBlocks.h b/src/compiler/translator/RewriteElseBlocks.h index 10221335..172928f7 100644 --- a/src/compiler/translator/RewriteElseBlocks.h +++ b/src/compiler/translator/RewriteElseBlocks.h @@ -18,16 +18,14 @@ namespace sh class ElseBlockRewriter : public TIntermTraverser { public: - ElseBlockRewriter() - : TIntermTraverser(false, false, true, false) - , mTemporaryIndex(0) - {} + ElseBlockRewriter(); protected: bool visitAggregate(Visit visit, TIntermAggregate *aggregate); private: int mTemporaryIndex; + const TType *mFunctionType; TIntermNode *rewriteSelection(TIntermSelection *selection); }; -- cgit v1.2.3 From 0d62e88949ac9df0b4fc20bb2c22530b5f590cad Mon Sep 17 00:00:00 2001 From: Bo Liu Date: Tue, 15 Jul 2014 14:01:37 -0700 Subject: Update makefiles after merge of Chromium at 37.0.2062.21 This commit was generated by merge_from_chromium.py. Change-Id: I5ee53788a2b2807f5777a00264ec3839a3d98ddf --- src/preprocessor.target.darwin-arm.mk | 2 +- src/preprocessor.target.darwin-arm64.mk | 2 -- src/preprocessor.target.darwin-mips.mk | 2 +- src/preprocessor.target.darwin-x86.mk | 2 +- src/preprocessor.target.darwin-x86_64.mk | 2 +- src/preprocessor.target.linux-arm.mk | 2 +- src/preprocessor.target.linux-arm64.mk | 2 -- src/preprocessor.target.linux-mips.mk | 2 +- src/preprocessor.target.linux-x86.mk | 2 +- src/preprocessor.target.linux-x86_64.mk | 2 +- src/translator.target.darwin-arm.mk | 2 +- src/translator.target.darwin-arm64.mk | 2 -- src/translator.target.darwin-mips.mk | 2 +- src/translator.target.darwin-x86.mk | 2 +- src/translator.target.darwin-x86_64.mk | 2 +- src/translator.target.linux-arm.mk | 2 +- src/translator.target.linux-arm64.mk | 2 -- src/translator.target.linux-mips.mk | 2 +- src/translator.target.linux-x86.mk | 2 +- src/translator.target.linux-x86_64.mk | 2 +- src/translator_lib.target.darwin-arm.mk | 2 +- src/translator_lib.target.darwin-arm64.mk | 2 -- src/translator_lib.target.darwin-mips.mk | 2 +- src/translator_lib.target.darwin-x86.mk | 2 +- src/translator_lib.target.darwin-x86_64.mk | 2 +- src/translator_lib.target.linux-arm.mk | 2 +- src/translator_lib.target.linux-arm64.mk | 2 -- src/translator_lib.target.linux-mips.mk | 2 +- src/translator_lib.target.linux-x86.mk | 2 +- src/translator_lib.target.linux-x86_64.mk | 2 +- 30 files changed, 24 insertions(+), 36 deletions(-) diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk index 97397ee7..6e31961e 100644 --- a/src/preprocessor.target.darwin-arm.mk +++ b/src/preprocessor.target.darwin-arm.mk @@ -75,9 +75,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/preprocessor.target.darwin-arm64.mk b/src/preprocessor.target.darwin-arm64.mk index 2164418b..b44a9a11 100644 --- a/src/preprocessor.target.darwin-arm64.mk +++ b/src/preprocessor.target.darwin-arm64.mk @@ -65,7 +65,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -158,7 +157,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk index 8ef0eaa7..eed71374 100644 --- a/src/preprocessor.target.darwin-mips.mk +++ b/src/preprocessor.target.darwin-mips.mk @@ -70,9 +70,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk index 802f31d6..827630f8 100644 --- a/src/preprocessor.target.darwin-x86.mk +++ b/src/preprocessor.target.darwin-x86.mk @@ -70,9 +70,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/preprocessor.target.darwin-x86_64.mk b/src/preprocessor.target.darwin-x86_64.mk index d7c4ddbd..9486f178 100644 --- a/src/preprocessor.target.darwin-x86_64.mk +++ b/src/preprocessor.target.darwin-x86_64.mk @@ -69,9 +69,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk index 97397ee7..6e31961e 100644 --- a/src/preprocessor.target.linux-arm.mk +++ b/src/preprocessor.target.linux-arm.mk @@ -75,9 +75,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/preprocessor.target.linux-arm64.mk b/src/preprocessor.target.linux-arm64.mk index 2164418b..b44a9a11 100644 --- a/src/preprocessor.target.linux-arm64.mk +++ b/src/preprocessor.target.linux-arm64.mk @@ -65,7 +65,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -158,7 +157,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk index 8ef0eaa7..eed71374 100644 --- a/src/preprocessor.target.linux-mips.mk +++ b/src/preprocessor.target.linux-mips.mk @@ -70,9 +70,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk index 802f31d6..827630f8 100644 --- a/src/preprocessor.target.linux-x86.mk +++ b/src/preprocessor.target.linux-x86.mk @@ -70,9 +70,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/preprocessor.target.linux-x86_64.mk b/src/preprocessor.target.linux-x86_64.mk index d7c4ddbd..9486f178 100644 --- a/src/preprocessor.target.linux-x86_64.mk +++ b/src/preprocessor.target.linux-x86_64.mk @@ -69,9 +69,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator.target.darwin-arm.mk b/src/translator.target.darwin-arm.mk index 4c5ea670..61923071 100644 --- a/src/translator.target.darwin-arm.mk +++ b/src/translator.target.darwin-arm.mk @@ -65,9 +65,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator.target.darwin-arm64.mk b/src/translator.target.darwin-arm64.mk index 979c0d0e..7ed7b99a 100644 --- a/src/translator.target.darwin-arm64.mk +++ b/src/translator.target.darwin-arm64.mk @@ -55,7 +55,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -151,7 +150,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/src/translator.target.darwin-mips.mk b/src/translator.target.darwin-mips.mk index 4c554e83..de13d11d 100644 --- a/src/translator.target.darwin-mips.mk +++ b/src/translator.target.darwin-mips.mk @@ -60,9 +60,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator.target.darwin-x86.mk b/src/translator.target.darwin-x86.mk index 4e85102b..60a14730 100644 --- a/src/translator.target.darwin-x86.mk +++ b/src/translator.target.darwin-x86.mk @@ -60,9 +60,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator.target.darwin-x86_64.mk b/src/translator.target.darwin-x86_64.mk index 900cace4..0c717e67 100644 --- a/src/translator.target.darwin-x86_64.mk +++ b/src/translator.target.darwin-x86_64.mk @@ -59,9 +59,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator.target.linux-arm.mk b/src/translator.target.linux-arm.mk index 4c5ea670..61923071 100644 --- a/src/translator.target.linux-arm.mk +++ b/src/translator.target.linux-arm.mk @@ -65,9 +65,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator.target.linux-arm64.mk b/src/translator.target.linux-arm64.mk index 979c0d0e..7ed7b99a 100644 --- a/src/translator.target.linux-arm64.mk +++ b/src/translator.target.linux-arm64.mk @@ -55,7 +55,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -151,7 +150,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/src/translator.target.linux-mips.mk b/src/translator.target.linux-mips.mk index 4c554e83..de13d11d 100644 --- a/src/translator.target.linux-mips.mk +++ b/src/translator.target.linux-mips.mk @@ -60,9 +60,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator.target.linux-x86.mk b/src/translator.target.linux-x86.mk index 4e85102b..60a14730 100644 --- a/src/translator.target.linux-x86.mk +++ b/src/translator.target.linux-x86.mk @@ -60,9 +60,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator.target.linux-x86_64.mk b/src/translator.target.linux-x86_64.mk index 900cace4..0c717e67 100644 --- a/src/translator.target.linux-x86_64.mk +++ b/src/translator.target.linux-x86_64.mk @@ -59,9 +59,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator_lib.target.darwin-arm.mk b/src/translator_lib.target.darwin-arm.mk index 02ef5341..52572270 100644 --- a/src/translator_lib.target.darwin-arm.mk +++ b/src/translator_lib.target.darwin-arm.mk @@ -123,9 +123,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator_lib.target.darwin-arm64.mk b/src/translator_lib.target.darwin-arm64.mk index 3eff2865..de63709d 100644 --- a/src/translator_lib.target.darwin-arm64.mk +++ b/src/translator_lib.target.darwin-arm64.mk @@ -113,7 +113,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -208,7 +207,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/src/translator_lib.target.darwin-mips.mk b/src/translator_lib.target.darwin-mips.mk index 0fff8eff..a3383764 100644 --- a/src/translator_lib.target.darwin-mips.mk +++ b/src/translator_lib.target.darwin-mips.mk @@ -118,9 +118,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator_lib.target.darwin-x86.mk b/src/translator_lib.target.darwin-x86.mk index ab75a2f0..1c3ed025 100644 --- a/src/translator_lib.target.darwin-x86.mk +++ b/src/translator_lib.target.darwin-x86.mk @@ -118,9 +118,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator_lib.target.darwin-x86_64.mk b/src/translator_lib.target.darwin-x86_64.mk index bed27e2a..a9416fa2 100644 --- a/src/translator_lib.target.darwin-x86_64.mk +++ b/src/translator_lib.target.darwin-x86_64.mk @@ -117,9 +117,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator_lib.target.linux-arm.mk b/src/translator_lib.target.linux-arm.mk index 02ef5341..52572270 100644 --- a/src/translator_lib.target.linux-arm.mk +++ b/src/translator_lib.target.linux-arm.mk @@ -123,9 +123,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator_lib.target.linux-arm64.mk b/src/translator_lib.target.linux-arm64.mk index 3eff2865..de63709d 100644 --- a/src/translator_lib.target.linux-arm64.mk +++ b/src/translator_lib.target.linux-arm64.mk @@ -113,7 +113,6 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -208,7 +207,6 @@ MY_CFLAGS_Release := \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer \ -funwind-tables MY_DEFS_Release := \ diff --git a/src/translator_lib.target.linux-mips.mk b/src/translator_lib.target.linux-mips.mk index 0fff8eff..a3383764 100644 --- a/src/translator_lib.target.linux-mips.mk +++ b/src/translator_lib.target.linux-mips.mk @@ -118,9 +118,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator_lib.target.linux-x86.mk b/src/translator_lib.target.linux-x86.mk index ab75a2f0..1c3ed025 100644 --- a/src/translator_lib.target.linux-x86.mk +++ b/src/translator_lib.target.linux-x86.mk @@ -118,9 +118,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ diff --git a/src/translator_lib.target.linux-x86_64.mk b/src/translator_lib.target.linux-x86_64.mk index bed27e2a..a9416fa2 100644 --- a/src/translator_lib.target.linux-x86_64.mk +++ b/src/translator_lib.target.linux-x86_64.mk @@ -117,9 +117,9 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ - -fomit-frame-pointer \ -fdata-sections \ -ffunction-sections \ + -fomit-frame-pointer \ -funwind-tables MY_DEFS_Debug := \ -- cgit v1.2.3 From c333af9c8e6b776363b722d9e9c4fed0b597f984 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Thu, 12 Jun 2014 13:41:17 -0400 Subject: Use commit_id.py on Windows, and handle missing git. This allows us to delete the Windows batch file. Changes the commit_id script to take the working directory so that it can be called from a different working directory than the angle repository is in. Renames the generated commit header to angle_commit.h. This is being written to the shared generated code directory for the entire build, and "commit.h" is insufficiently unique. BUG=angle:669 BUG=395705 Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3 Reviewed-on: https://chromium-review.googlesource.com/209617 Tested-by: Jamie Madill Reviewed-by: Geoff Lang --- generate_projects | 1 + projects/build/All.vcxproj | 16 +++--- projects/build/all.sln | 6 +-- projects/samples/samples.sln | 4 -- projects/src/angle.sln | 4 -- projects/src/commit_id.vcxproj | 36 ++++--------- projects/src/commit_id.vcxproj.filters | 40 --------------- projects/src/copy_compiler_dll.vcxproj | 2 +- projects/src/copy_scripts.vcxproj | 18 +++---- projects/src/libEGL.vcxproj | 12 ++--- projects/src/libGLESv2.vcxproj | 8 +-- src/angle.gypi | 94 +++++++++++++++++++++------------- src/commit.h | 14 +++++ src/commit_id.bat | 15 ------ src/commit_id.py | 26 ++++++++-- src/common/version.h | 2 +- src/libGLESv2/ProgramBinary.cpp | 4 ++ 17 files changed, 132 insertions(+), 170 deletions(-) delete mode 100644 projects/src/commit_id.vcxproj.filters create mode 100644 src/commit.h delete mode 100644 src/commit_id.bat diff --git a/generate_projects b/generate_projects index 67432545..81752779 100644 --- a/generate_projects +++ b/generate_projects @@ -34,6 +34,7 @@ if __name__ == '__main__': gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0') gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0') gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false') + gyp_cmd += ' -D angle_use_commit_id=0' gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp') print 'Generating projects to ' + generation_dir + ' from gyp files...' diff --git a/projects/build/All.vcxproj b/projects/build/All.vcxproj index fc2689af..e4d508a3 100644 --- a/projects/build/All.vcxproj +++ b/projects/build/All.vcxproj @@ -36,7 +36,7 @@ - $(OutDir)obj\global_intermediate;..\..\include;..\..\samples\angle\sample_util;%(AdditionalIncludeDirectories) + $(OutDir)obj\global_intermediate\angle;..\..\include;..\..\samples\angle\sample_util;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) EnableFastChecks true @@ -65,14 +65,14 @@ MachineX86 - $(OutDir)obj\global_intermediate;..\..\include;..\..\samples\angle\sample_util;%(AdditionalIncludeDirectories) + $(OutDir)obj\global_intermediate\angle;..\..\include;..\..\samples\angle\sample_util;%(AdditionalIncludeDirectories) 0x0409 ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions);%(PreprocessorDefinitions) - $(OutDir)obj\global_intermediate;..\..\include;..\..\samples\angle\sample_util;%(AdditionalIncludeDirectories) + $(OutDir)obj\global_intermediate\angle;..\..\include;..\..\samples\angle\sample_util;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) true ProgramDatabase @@ -100,7 +100,7 @@ MachineX86 - $(OutDir)obj\global_intermediate;..\..\include;..\..\samples\angle\sample_util;%(AdditionalIncludeDirectories) + $(OutDir)obj\global_intermediate\angle;..\..\include;..\..\samples\angle\sample_util;%(AdditionalIncludeDirectories) 0x0409 ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions);%(PreprocessorDefinitions) @@ -113,10 +113,6 @@ {63FB0B97-D1D9-5158-8E85-7F5B1E403817} false - - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - false - {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} false @@ -133,6 +129,10 @@ {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} false + + {3B7F5656-177F-52EE-26B3-D6A75368D0A9} + false + {22DC02D5-1598-943C-13E1-82185B469F81} false diff --git a/projects/build/all.sln b/projects/build/all.sln index 1aa07965..5862eddf 100644 --- a/projects/build/all.sln +++ b/projects/build/all.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}" ProjectSection(ProjectDependencies) = postProject {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} {276D20F5-2943-414C-0FF6-21F4723A5CF6} = {276D20F5-2943-414C-0FF6-21F4723A5CF6} {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679} {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} + {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} {FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061} @@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" - ProjectSection(ProjectDependencies) = postProject - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" ProjectSection(ProjectDependencies) = postProject @@ -68,7 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx ProjectSection(ProjectDependencies) = postProject {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln index 53cec34d..b9278604 100644 --- a/projects/samples/samples.sln +++ b/projects/samples/samples.sln @@ -1,9 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" - ProjectSection(ProjectDependencies) = postProject - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" ProjectSection(ProjectDependencies) = postProject @@ -39,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx ProjectSection(ProjectDependencies) = postProject {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" diff --git a/projects/src/angle.sln b/projects/src/angle.sln index 0d6ec650..cdf9f53c 100644 --- a/projects/src/angle.sln +++ b/projects/src/angle.sln @@ -1,9 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" - ProjectSection(ProjectDependencies) = postProject - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" ProjectSection(ProjectDependencies) = postProject @@ -16,7 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", ProjectSection(ProjectDependencies) = postProject {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" diff --git a/projects/src/commit_id.vcxproj b/projects/src/commit_id.vcxproj index a73f4630..6acbadc7 100644 --- a/projects/src/commit_id.vcxproj +++ b/projects/src/commit_id.vcxproj @@ -36,16 +36,14 @@ - C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) EnableFastChecks true ProgramDatabase - 4100;4127;4239;4244;4245;4512;4702;4530;4718;4267;%(DisableSpecificWarnings) true false Disabled - _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;_DEBUG;%(PreprocessorDefinitions) + ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };%(PreprocessorDefinitions) MultiThreadedDebug true true @@ -55,7 +53,7 @@ C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories) - kernel32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib + C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories) false true @@ -65,22 +63,19 @@ MachineX86 - C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) 0x0409 - ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;_DEBUG;%(PreprocessorDefinitions) + ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };%(PreprocessorDefinitions);%(PreprocessorDefinitions) - C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) true ProgramDatabase - 4100;4127;4239;4244;4245;4512;4702;4530;4718;4267;%(DisableSpecificWarnings) true false MaxSpeed - _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;NDEBUG;%(PreprocessorDefinitions) + ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };%(PreprocessorDefinitions) MultiThreaded true true @@ -90,7 +85,7 @@ C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories) - kernel32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib + C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories) false false @@ -100,32 +95,21 @@ MachineX86 - C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) 0x0409 - ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };NOMINMAX;NDEBUG;%(PreprocessorDefinitions) + ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };%(PreprocessorDefinitions);%(PreprocessorDefinitions) - - true - - + Document - call call $(OutDir)obj\global_intermediate\commit_id.bat "$(OutDir)obj\global_intermediate" - Generating commit ID header... - $(OutDir)obj\global_intermediate\commit.h - ..\..\.git\index + call mkdir "$(OutDir)obj\global_intermediate\angle\id" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\src\commit.h" "$(OutDir)obj\global_intermediate\angle\id\commit.h" + Copying commit.h to $(OutDir)obj/global_intermediate/angle/id\commit.h + $(OutDir)obj\global_intermediate\angle\id\commit.h - - - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - false - - diff --git a/projects/src/commit_id.vcxproj.filters b/projects/src/commit_id.vcxproj.filters deleted file mode 100644 index 36138339..00000000 --- a/projects/src/commit_id.vcxproj.filters +++ /dev/null @@ -1,40 +0,0 @@ - - - - - {7BD4F48B-77B4-AB58-9E24-A7302D190D1C} - - - {14CEDE64-16A7-96A9-EF19-5C5D6085FF18} - - - {158E591E-B6EA-0C85-8F5A-18EAFA09B4CE} - - - {739DB09A-CC57-A953-A6CF-F64FA08E4FA7} - - - {739DB09A-CC57-A953-A6CF-F64FA08E4FA7} - - - {8CDEE807-BC53-E450-C8B8-4DEBB66742D4} - - - {3C74FDB1-3FB1-8FA9-1073-A344751C6694} - - - {158E591E-B6EA-0C85-8F5A-18EAFA09B4CE} - - - - - $(OutDir)obj\global_intermediate\_excluded_files - - - ..\..\src - - - ..\..\.git\_excluded_files - - - diff --git a/projects/src/copy_compiler_dll.vcxproj b/projects/src/copy_compiler_dll.vcxproj index 010887f2..6b8587cd 100644 --- a/projects/src/copy_compiler_dll.vcxproj +++ b/projects/src/copy_compiler_dll.vcxproj @@ -111,7 +111,7 @@ Document - call call $(OutDir)obj\global_intermediate\copy_compiler_dll.bat "$(Platform)" "C:\Program Files (x86)\Windows Kits\8.0" "$(OutDir)" + call call $(OutDir)obj\global_intermediate\angle\copy_compiler_dll.bat "$(Platform)" "C:\Program Files (x86)\Windows Kits\8.0" "$(OutDir)" Copying D3D Compiler DLL... $(OutDir)\D3DCompiler_46.dll diff --git a/projects/src/copy_scripts.vcxproj b/projects/src/copy_scripts.vcxproj index c10663f4..748d69af 100644 --- a/projects/src/copy_scripts.vcxproj +++ b/projects/src/copy_scripts.vcxproj @@ -105,21 +105,15 @@ Document - call mkdir "$(OutDir)obj\global_intermediate" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\src\commit_id.py" "$(OutDir)obj\global_intermediate\commit_id.py" - Copying commit_id.py to $(OutDir)obj/global_intermediate\commit_id.py - $(OutDir)obj\global_intermediate\commit_id.py - - - Document - call mkdir "$(OutDir)obj\global_intermediate" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\src\commit_id.bat" "$(OutDir)obj\global_intermediate\commit_id.bat" - Copying commit_id.bat to $(OutDir)obj/global_intermediate\commit_id.bat - $(OutDir)obj\global_intermediate\commit_id.bat + call mkdir "$(OutDir)obj\global_intermediate\angle" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\src\commit_id.py" "$(OutDir)obj\global_intermediate\angle\commit_id.py" + Copying commit_id.py to $(OutDir)obj/global_intermediate/angle\commit_id.py + $(OutDir)obj\global_intermediate\angle\commit_id.py Document - call mkdir "$(OutDir)obj\global_intermediate" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\src\copy_compiler_dll.bat" "$(OutDir)obj\global_intermediate\copy_compiler_dll.bat" - Copying copy_compiler_dll.bat to $(OutDir)obj/global_intermediate\copy_compiler_dll.bat - $(OutDir)obj\global_intermediate\copy_compiler_dll.bat + call mkdir "$(OutDir)obj\global_intermediate\angle" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\src\copy_compiler_dll.bat" "$(OutDir)obj\global_intermediate\angle\copy_compiler_dll.bat" + Copying copy_compiler_dll.bat to $(OutDir)obj/global_intermediate/angle\copy_compiler_dll.bat + $(OutDir)obj\global_intermediate\angle\copy_compiler_dll.bat diff --git a/projects/src/libEGL.vcxproj b/projects/src/libEGL.vcxproj index 71c8ab12..4daf31da 100644 --- a/projects/src/libEGL.vcxproj +++ b/projects/src/libEGL.vcxproj @@ -37,7 +37,7 @@ - ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) + ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) EnableFastChecks true @@ -68,14 +68,14 @@ MachineX86 - ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) + ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) 0x0409 ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions) - ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) + ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) true ProgramDatabase @@ -105,7 +105,7 @@ MachineX86 - ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) + ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) 0x0409 ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;NDEBUG;%(PreprocessorDefinitions) @@ -166,10 +166,6 @@ {3B7F5656-177F-52EE-26B3-D6A75368D0A9} false - - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - false - diff --git a/projects/src/libGLESv2.vcxproj b/projects/src/libGLESv2.vcxproj index 6ab232fd..28a77936 100644 --- a/projects/src/libGLESv2.vcxproj +++ b/projects/src/libGLESv2.vcxproj @@ -37,7 +37,7 @@ - ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) + ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) EnableFastChecks true @@ -68,14 +68,14 @@ MachineX86 - ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) + ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) 0x0409 ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;ANGLE_ENABLE_PERF;_DEBUG;%(PreprocessorDefinitions) - ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) + ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) /MP %(AdditionalOptions) true ProgramDatabase @@ -105,7 +105,7 @@ MachineX86 - ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) + ..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories) 0x0409 ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;NOMINMAX;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions) diff --git a/src/angle.gypi b/src/angle.gypi index 5339369f..ef167495 100644 --- a/src/angle.gypi +++ b/src/angle.gypi @@ -7,6 +7,12 @@ { 'angle_code': 1, 'angle_post_build_script%': 0, + 'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle', + 'angle_id_script_base': 'commit_id.py', + 'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)', + 'angle_id_header_base': 'commit.h', + 'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)', + 'angle_use_commit_id%': ' %1%\commit.h - -REM commit hash size -set _Str=#define ANGLE_COMMIT_HASH_SIZE 12 -echo %_Str% >> %1%\commit.h - -REM commit date -(FOR /F "delims=" %%i IN ('call git show -s --format^="%%ci" HEAD') DO set _Str=%%i) || (set _Str=Unknown Date) -set _Str=#define ANGLE_COMMIT_DATE "%_Str%" -echo %_Str% >> %1%\commit.h diff --git a/src/commit_id.py b/src/commit_id.py index 6339cca3..7f711e75 100644 --- a/src/commit_id.py +++ b/src/commit_id.py @@ -1,19 +1,35 @@ import subprocess as sp import sys +import os -def grab_output(*command): - return sp.Popen(command, stdout=sp.PIPE).communicate()[0].strip() +# Usage: commit_id.py check (checks if git is present) +# Usage: commit_id.py gen (generates commit id) +def grab_output(command, cwd): + return sp.Popen(command, stdout=sp.PIPE, shell=True, cwd=cwd).communicate()[0].strip() + +operation = sys.argv[1] +cwd = sys.argv[2] + +if operation == 'check': + index_path = os.path.join(cwd, '.git', 'index') + if os.path.exists(index_path): + print("1") + else: + print("0") + sys.exit(0) + +output_file = sys.argv[3] commit_id_size = 12 try: - commit_id = grab_output('git', 'rev-parse', '--short=%d' % commit_id_size, 'HEAD') - commit_date = grab_output('git', 'show', '-s', '--format=%ci', 'HEAD') + commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd) + commit_date = grab_output('git show -s --format=%ci HEAD', cwd) except: commit_id = 'invalid-hash' commit_date = 'invalid-date' -hfile = open(sys.argv[1], 'w') +hfile = open(output_file, 'w') hfile.write('#define ANGLE_COMMIT_HASH "%s"\n' % commit_id) hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size) diff --git a/src/common/version.h b/src/common/version.h index b9781d71..d9148d19 100644 --- a/src/common/version.h +++ b/src/common/version.h @@ -1,4 +1,4 @@ -#include "commit.h" +#include "id/commit.h" #define ANGLE_MAJOR_VERSION 2 #define ANGLE_MINOR_VERSION 1 diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp index 8525ffbd..e3ffa479 100644 --- a/src/libGLESv2/ProgramBinary.cpp +++ b/src/libGLESv2/ProgramBinary.cpp @@ -1018,6 +1018,9 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShade bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) { +#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD + return false; +#else BinaryInputStream stream(binary, length); int format = stream.readInt(); @@ -1260,6 +1263,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) initializeUniformStorage(); return true; +#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD } bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length) -- cgit v1.2.3 From 3e3b0575efabc97bfa914af12e786974da12e06f Mon Sep 17 00:00:00 2001 From: Bo Liu Date: Tue, 29 Jul 2014 11:16:26 -0700 Subject: Update makefiles after merge of Chromium at 37.0.2062.52 This commit was generated by merge_from_chromium.py. Change-Id: I6b7475bf1f9c487fa6e03a26fac0a25bd633d0d6 --- src/commit_id.target.darwin-arm.mk | 20 ++++++++++---------- src/commit_id.target.darwin-arm64.mk | 20 ++++++++++---------- src/commit_id.target.darwin-mips.mk | 20 ++++++++++---------- src/commit_id.target.darwin-x86.mk | 20 ++++++++++---------- src/commit_id.target.darwin-x86_64.mk | 20 ++++++++++---------- src/commit_id.target.linux-arm.mk | 20 ++++++++++---------- src/commit_id.target.linux-arm64.mk | 20 ++++++++++---------- src/commit_id.target.linux-mips.mk | 20 ++++++++++---------- src/commit_id.target.linux-x86.mk | 20 ++++++++++---------- src/commit_id.target.linux-x86_64.mk | 20 ++++++++++---------- src/copy_scripts.target.darwin-arm.mk | 11 +++-------- src/copy_scripts.target.darwin-arm64.mk | 11 +++-------- src/copy_scripts.target.darwin-mips.mk | 11 +++-------- src/copy_scripts.target.darwin-x86.mk | 11 +++-------- src/copy_scripts.target.darwin-x86_64.mk | 11 +++-------- src/copy_scripts.target.linux-arm.mk | 11 +++-------- src/copy_scripts.target.linux-arm64.mk | 11 +++-------- src/copy_scripts.target.linux-mips.mk | 11 +++-------- src/copy_scripts.target.linux-x86.mk | 11 +++-------- src/copy_scripts.target.linux-x86_64.mk | 11 +++-------- 20 files changed, 130 insertions(+), 180 deletions(-) diff --git a/src/commit_id.target.darwin-arm.mk b/src/commit_id.target.darwin-arm.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.darwin-arm.mk +++ b/src/commit_id.target.darwin-arm.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.darwin-arm64.mk b/src/commit_id.target.darwin-arm64.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.darwin-arm64.mk +++ b/src/commit_id.target.darwin-arm64.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.darwin-mips.mk b/src/commit_id.target.darwin-mips.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.darwin-mips.mk +++ b/src/commit_id.target.darwin-mips.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.darwin-x86.mk b/src/commit_id.target.darwin-x86.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.darwin-x86.mk +++ b/src/commit_id.target.darwin-x86.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.darwin-x86_64.mk b/src/commit_id.target.darwin-x86_64.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.darwin-x86_64.mk +++ b/src/commit_id.target.darwin-x86_64.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.linux-arm.mk b/src/commit_id.target.linux-arm.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.linux-arm.mk +++ b/src/commit_id.target.linux-arm.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.linux-arm64.mk b/src/commit_id.target.linux-arm64.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.linux-arm64.mk +++ b/src/commit_id.target.linux-arm64.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.linux-mips.mk b/src/commit_id.target.linux-mips.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.linux-mips.mk +++ b/src/commit_id.target.linux-mips.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.linux-x86.mk b/src/commit_id.target.linux-x86.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.linux-x86.mk +++ b/src/commit_id.target.linux-x86.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/commit_id.target.linux-x86_64.mk b/src/commit_id.target.linux-x86_64.mk index 171bd528..20fe3261 100644 --- a/src/commit_id.target.linux-x86_64.mk +++ b/src/commit_id.target.linux-x86_64.mk @@ -15,20 +15,20 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_angle_src_copy_scripts_gyp,,,$(GYP_VAR_PREFIX))/copy_scripts.stamp -### Rules for action "Generate Commit ID Header": -$(gyp_shared_intermediate_dir)/commit.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/commit.h: $(gyp_shared_intermediate_dir)/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) - @echo "Gyp action: Generating commit ID header... ($@)" - $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir); python "$(gyp_shared_intermediate_dir)/commit_id.py" "$(gyp_shared_intermediate_dir)/commit.h" +### Rules for action "Generate ANGLE Commit ID Header": +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/angle/id/commit.h: $(gyp_shared_intermediate_dir)/angle/commit_id.py $(LOCAL_PATH)/third_party/angle/.git/index $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Generating ANGLE Commit ID ($@)" + $(hide)cd $(gyp_local_path)/third_party/angle/src; mkdir -p $(gyp_shared_intermediate_dir)/angle/id; python "$(gyp_shared_intermediate_dir)/angle/commit_id.py" gen ../../../third_party/angle "$(gyp_shared_intermediate_dir)/angle/id/commit.h" GYP_GENERATED_OUTPUTS := \ - $(gyp_shared_intermediate_dir)/commit.h + $(gyp_shared_intermediate_dir)/angle/id/commit.h # Make sure our deps and generated files are built first. LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) diff --git a/src/copy_scripts.target.darwin-arm.mk b/src/copy_scripts.target.darwin-arm.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.darwin-arm.mk +++ b/src/copy_scripts.target.darwin-arm.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.darwin-arm64.mk b/src/copy_scripts.target.darwin-arm64.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.darwin-arm64.mk +++ b/src/copy_scripts.target.darwin-arm64.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.darwin-mips.mk b/src/copy_scripts.target.darwin-mips.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.darwin-mips.mk +++ b/src/copy_scripts.target.darwin-mips.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.darwin-x86.mk b/src/copy_scripts.target.darwin-x86.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.darwin-x86.mk +++ b/src/copy_scripts.target.darwin-x86.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.darwin-x86_64.mk b/src/copy_scripts.target.darwin-x86_64.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.darwin-x86_64.mk +++ b/src/copy_scripts.target.darwin-x86_64.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.linux-arm.mk b/src/copy_scripts.target.linux-arm.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.linux-arm.mk +++ b/src/copy_scripts.target.linux-arm.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.linux-arm64.mk b/src/copy_scripts.target.linux-arm64.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.linux-arm64.mk +++ b/src/copy_scripts.target.linux-arm64.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.linux-mips.mk b/src/copy_scripts.target.linux-mips.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.linux-mips.mk +++ b/src/copy_scripts.target.linux-mips.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.linux-x86.mk b/src/copy_scripts.target.linux-x86.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.linux-x86.mk +++ b/src/copy_scripts.target.linux-x86.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) diff --git a/src/copy_scripts.target.linux-x86_64.mk b/src/copy_scripts.target.linux-x86_64.mk index e48ae674..57d01e3b 100644 --- a/src/copy_scripts.target.linux-x86_64.mk +++ b/src/copy_scripts.target.linux-x86_64.mk @@ -15,22 +15,17 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V GYP_TARGET_DEPENDENCIES := ### Generated for copy rule. -$(gyp_shared_intermediate_dir)/commit_id.bat: $(LOCAL_PATH)/third_party/angle/src/commit_id.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/copy_compiler_dll.bat: $(LOCAL_PATH)/third_party/angle/src/copy_compiler_dll.bat $(GYP_TARGET_DEPENDENCIES) | $(ACP) +$(gyp_shared_intermediate_dir)/angle/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) @echo Copying: $@ $(hide) mkdir -p $(dir $@) $(hide) $(ACP) -rpf $< $@ -$(gyp_shared_intermediate_dir)/commit_id.py: $(LOCAL_PATH)/third_party/angle/src/commit_id.py $(GYP_TARGET_DEPENDENCIES) | $(ACP) - @echo Copying: $@ - $(hide) mkdir -p $(dir $@) - $(hide) $(ACP) -rpf $< $@ - -third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/commit_id.bat $(gyp_shared_intermediate_dir)/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/commit_id.py +third_party_angle_src_build_angle_gyp_copy_scripts_target_copies = $(gyp_shared_intermediate_dir)/angle/copy_compiler_dll.bat $(gyp_shared_intermediate_dir)/angle/commit_id.py GYP_GENERATED_OUTPUTS := \ $(third_party_angle_src_build_angle_gyp_copy_scripts_target_copies) -- cgit v1.2.3 From 75551cf9a7c65bcdb9f9fe44ac78ca15da37942e Mon Sep 17 00:00:00 2001 From: Nicolas Capens Date: Mon, 11 Aug 2014 10:26:07 -0700 Subject: Avoid D3D11 primitive restart index using 32-bit indices D3D11 interprets an index value of 0xFFFF in a 16-bit index buffer as a primitive restart marker. This behavior can't be toggled off. http://msdn.microsoft.com/en-us/library/windows/desktop/bb205124(v=vs.85).aspx We work around it by converting to 32-bit indices. BUG=angle:708 Change-Id: Ibc92d6ba98e5f11a98d76cae14f90ca050a19964 Reviewed-on: https://chromium-review.googlesource.com/211426 Reviewed-by: Shannon Woods Tested-by: Nicolas Capens --- src/libGLESv2/renderer/IndexDataManager.cpp | 59 +++++++++++++++++++++-------- src/libGLESv2/renderer/IndexDataManager.h | 3 +- src/libGLESv2/renderer/d3d11/Renderer11.cpp | 9 ++--- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/libGLESv2/renderer/IndexDataManager.cpp b/src/libGLESv2/renderer/IndexDataManager.cpp index b8c7fa97..fdd79891 100644 --- a/src/libGLESv2/renderer/IndexDataManager.cpp +++ b/src/libGLESv2/renderer/IndexDataManager.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" // -// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved. +// Copyright (c) 2002-2014 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. // @@ -15,6 +15,7 @@ #include "libGLESv2/main.h" #include "libGLESv2/formatutils.h" #include "libGLESv2/renderer/IndexBuffer.h" +#include "libGLESv2/renderer/Renderer.h" namespace rx { @@ -54,10 +55,11 @@ IndexDataManager::~IndexDataManager() delete mCountingBuffer; } -static void convertIndices(GLenum type, const void *input, GLsizei count, void *output) +static void convertIndices(GLenum sourceType, GLenum destinationType, const void *input, GLsizei count, void *output) { - if (type == GL_UNSIGNED_BYTE) + if (sourceType == GL_UNSIGNED_BYTE) { + ASSERT(destinationType == GL_UNSIGNED_SHORT); const GLubyte *in = static_cast(input); GLushort *out = static_cast(output); @@ -66,13 +68,28 @@ static void convertIndices(GLenum type, const void *input, GLsizei count, void * out[i] = in[i]; } } - else if (type == GL_UNSIGNED_INT) + else if (sourceType == GL_UNSIGNED_INT) { + ASSERT(destinationType == GL_UNSIGNED_INT); memcpy(output, input, count * sizeof(GLuint)); } - else if (type == GL_UNSIGNED_SHORT) + else if (sourceType == GL_UNSIGNED_SHORT) { - memcpy(output, input, count * sizeof(GLushort)); + if (destinationType == GL_UNSIGNED_SHORT) + { + memcpy(output, input, count * sizeof(GLushort)); + } + else if (destinationType == GL_UNSIGNED_INT) + { + const GLushort *in = static_cast(input); + GLuint *out = static_cast(output); + + for (GLsizei i = 0; i < count; i++) + { + out[i] = in[i]; + } + } + else UNREACHABLE(); } else UNREACHABLE(); } @@ -155,21 +172,18 @@ GLenum IndexDataManager::prepareIndexData(GLenum type, GLsizei count, gl::Buffer indices = static_cast(storage->getData()) + offset; } - StreamingIndexBufferInterface *streamingBuffer = (type == GL_UNSIGNED_INT) ? mStreamingBufferInt : mStreamingBufferShort; - StaticIndexBufferInterface *staticBuffer = buffer ? buffer->getStaticIndexBuffer() : NULL; - IndexBufferInterface *indexBuffer = streamingBuffer; + IndexBufferInterface *indexBuffer = NULL; bool directStorage = alignedOffset && storage && storage->supportsDirectBinding() && destinationIndexType == type; unsigned int streamOffset = 0; if (directStorage) { - indexBuffer = streamingBuffer; streamOffset = offset; if (!buffer->getIndexRangeCache()->findRange(type, offset, count, &translated->minIndex, - &translated->maxIndex, NULL)) + &translated->maxIndex, NULL)) { computeRange(type, indices, count, &translated->minIndex, &translated->maxIndex); buffer->getIndexRangeCache()->addRange(type, offset, count, translated->minIndex, @@ -191,6 +205,22 @@ GLenum IndexDataManager::prepareIndexData(GLenum type, GLsizei count, gl::Buffer } else { + computeRange(type, indices, count, &translated->minIndex, &translated->maxIndex); + } + + // Avoid D3D11's primitive restart index value + // see http://msdn.microsoft.com/en-us/library/windows/desktop/bb205124(v=vs.85).aspx + if (translated->maxIndex == 0xFFFF && type == GL_UNSIGNED_SHORT && mRenderer->getMajorShaderModel() > 3) + { + destinationIndexType = GL_UNSIGNED_INT; + directStorage = false; + indexBuffer = NULL; + } + + if (!directStorage && !indexBuffer) + { + indexBuffer = (destinationIndexType == GL_UNSIGNED_INT) ? mStreamingBufferInt : mStreamingBufferShort; + unsigned int convertCount = count; if (staticBuffer) @@ -234,7 +264,7 @@ GLenum IndexDataManager::prepareIndexData(GLenum type, GLsizei count, gl::Buffer return GL_OUT_OF_MEMORY; } - convertIndices(type, staticBuffer ? storage->getData() : indices, convertCount, output); + convertIndices(type, destinationIndexType, staticBuffer ? storage->getData() : indices, convertCount, output); if (!indexBuffer->unmapBuffer()) { @@ -242,8 +272,6 @@ GLenum IndexDataManager::prepareIndexData(GLenum type, GLsizei count, gl::Buffer return GL_OUT_OF_MEMORY; } - computeRange(type, indices, count, &translated->minIndex, &translated->maxIndex); - if (staticBuffer) { streamOffset = (offset / gl::GetTypeBytes(type)) * gl::GetTypeBytes(destinationIndexType); @@ -253,10 +281,11 @@ GLenum IndexDataManager::prepareIndexData(GLenum type, GLsizei count, gl::Buffer } translated->storage = directStorage ? storage : NULL; - translated->indexBuffer = indexBuffer->getIndexBuffer(); + translated->indexBuffer = indexBuffer ? indexBuffer->getIndexBuffer() : NULL; translated->serial = directStorage ? storage->getSerial() : indexBuffer->getSerial(); translated->startIndex = streamOffset / gl::GetTypeBytes(destinationIndexType); translated->startOffset = streamOffset; + translated->indexType = destinationIndexType; if (buffer) { diff --git a/src/libGLESv2/renderer/IndexDataManager.h b/src/libGLESv2/renderer/IndexDataManager.h index 0e77c81d..70c7bf37 100644 --- a/src/libGLESv2/renderer/IndexDataManager.h +++ b/src/libGLESv2/renderer/IndexDataManager.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved. +// Copyright (c) 2002-2014 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. // @@ -39,6 +39,7 @@ struct TranslatedIndexData IndexBuffer *indexBuffer; BufferStorage *storage; + GLenum indexType; unsigned int serial; }; diff --git a/src/libGLESv2/renderer/d3d11/Renderer11.cpp b/src/libGLESv2/renderer/d3d11/Renderer11.cpp index c0ad111e..f02e334f 100644 --- a/src/libGLESv2/renderer/d3d11/Renderer11.cpp +++ b/src/libGLESv2/renderer/d3d11/Renderer11.cpp @@ -1137,10 +1137,8 @@ GLenum Renderer11::applyIndexBuffer(const GLvoid *indices, gl::Buffer *elementAr if (err == GL_NO_ERROR) { - IndexBuffer11* indexBuffer = IndexBuffer11::makeIndexBuffer11(indexInfo->indexBuffer); - ID3D11Buffer *buffer = NULL; - DXGI_FORMAT bufferFormat = indexBuffer->getIndexFormat(); + DXGI_FORMAT bufferFormat = (indexInfo->indexType == GL_UNSIGNED_INT) ? DXGI_FORMAT_R32_UINT : DXGI_FORMAT_R16_UINT; if (indexInfo->storage) { @@ -1149,6 +1147,7 @@ GLenum Renderer11::applyIndexBuffer(const GLvoid *indices, gl::Buffer *elementAr } else { + IndexBuffer11* indexBuffer = IndexBuffer11::makeIndexBuffer11(indexInfo->indexBuffer); buffer = indexBuffer->getBuffer(); } @@ -1372,7 +1371,7 @@ void Renderer11::drawLineLoop(GLsizei count, GLenum type, const GLvoid *indices, if (mAppliedIB != d3dIndexBuffer || mAppliedIBFormat != indexFormat || mAppliedIBOffset != indexBufferOffset) { - mDeviceContext->IASetIndexBuffer(indexBuffer->getBuffer(), indexBuffer->getIndexFormat(), indexBufferOffset); + mDeviceContext->IASetIndexBuffer(d3dIndexBuffer, indexFormat, indexBufferOffset); mAppliedIB = d3dIndexBuffer; mAppliedIBFormat = indexFormat; mAppliedIBOffset = indexBufferOffset; @@ -1483,7 +1482,7 @@ void Renderer11::drawTriangleFan(GLsizei count, GLenum type, const GLvoid *indic if (mAppliedIB != d3dIndexBuffer || mAppliedIBFormat != indexFormat || mAppliedIBOffset != indexBufferOffset) { - mDeviceContext->IASetIndexBuffer(indexBuffer->getBuffer(), indexBuffer->getIndexFormat(), indexBufferOffset); + mDeviceContext->IASetIndexBuffer(d3dIndexBuffer, indexFormat, indexBufferOffset); mAppliedIB = d3dIndexBuffer; mAppliedIBFormat = indexFormat; mAppliedIBOffset = indexBufferOffset; -- cgit v1.2.3 From f4126d2b9eb008d4e792fff2592f338e19c68569 Mon Sep 17 00:00:00 2001 From: Shannon Woods Date: Mon, 11 Aug 2014 14:08:19 -0400 Subject: Fix nameless struct handling. BUG=401296 The addition of layout qualifier handling in es3 development inadvertently broke handling of nameless structs. Change-Id: I805bab7a981d1f7f6227ae043720296fc3454662 Reviewed-on: https://chromium-review.googlesource.com/211860 Reviewed-by: Zhenyao Mo Tested-by: Shannon Woods Conflicts: src/compiler/translator/UniformHLSL.cpp Change-Id: I2f9fca71cef383c1a48c9bcdbe1083ac3222fac0 Reviewed-on: https://chromium-review.googlesource.com/212153 Reviewed-by: Zhenyao Mo Tested-by: Shannon Woods --- src/compiler/translator/OutputHLSL.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp index 5520c861..5cc2c141 100644 --- a/src/compiler/translator/OutputHLSL.cpp +++ b/src/compiler/translator/OutputHLSL.cpp @@ -582,7 +582,11 @@ void OutputHLSL::header() else { const TStructure *structure = type.getStruct(); - const TString &typeName = (structure ? structureTypeName(*structure, false, false) : typeString(type)); + // If this is a nameless struct, we need to use its full definition, rather than its (empty) name. + // TypeString() will invoke defineNameless in this case, but layout qualifiers, if relevant, will not + // be taken into account. + const TString &typeName = ((structure && !structure->name().empty()) ? + structureTypeName(*structure, false, false) : typeString(type)); const TString ®isterString = TString("register(") + RegisterPrefix(type) + str(registerIndex) + ")"; -- cgit v1.2.3 From 8eee38bd4151448e67a1aff3d7c8d9214df6de83 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 10 Sep 2014 10:54:34 +0100 Subject: Update makefiles after merge Change-Id: Ib7840cf059bccca236c609c4398ada4db83b553a --- src/preprocessor.target.darwin-arm.mk | 5 +++++ src/preprocessor.target.darwin-arm64.mk | 5 +++++ src/preprocessor.target.darwin-mips.mk | 5 +++++ src/preprocessor.target.darwin-x86.mk | 5 +++++ src/preprocessor.target.darwin-x86_64.mk | 5 +++++ src/preprocessor.target.linux-arm.mk | 5 +++++ src/preprocessor.target.linux-arm64.mk | 5 +++++ src/preprocessor.target.linux-mips.mk | 5 +++++ src/preprocessor.target.linux-x86.mk | 5 +++++ src/preprocessor.target.linux-x86_64.mk | 5 +++++ src/translator.target.darwin-arm.mk | 5 +++++ src/translator.target.darwin-arm64.mk | 5 +++++ src/translator.target.darwin-mips.mk | 5 +++++ src/translator.target.darwin-x86.mk | 5 +++++ src/translator.target.darwin-x86_64.mk | 5 +++++ src/translator.target.linux-arm.mk | 5 +++++ src/translator.target.linux-arm64.mk | 5 +++++ src/translator.target.linux-mips.mk | 5 +++++ src/translator.target.linux-x86.mk | 5 +++++ src/translator.target.linux-x86_64.mk | 5 +++++ src/translator_lib.target.darwin-arm.mk | 5 +++++ src/translator_lib.target.darwin-arm64.mk | 5 +++++ src/translator_lib.target.darwin-mips.mk | 5 +++++ src/translator_lib.target.darwin-x86.mk | 5 +++++ src/translator_lib.target.darwin-x86_64.mk | 5 +++++ src/translator_lib.target.linux-arm.mk | 5 +++++ src/translator_lib.target.linux-arm64.mk | 5 +++++ src/translator_lib.target.linux-mips.mk | 5 +++++ src/translator_lib.target.linux-x86.mk | 5 +++++ src/translator_lib.target.linux-x86_64.mk | 5 +++++ 30 files changed, 150 insertions(+) diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk index 6e31961e..5791e303 100644 --- a/src/preprocessor.target.darwin-arm.mk +++ b/src/preprocessor.target.darwin-arm.mk @@ -138,6 +138,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -240,7 +242,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.darwin-arm64.mk b/src/preprocessor.target.darwin-arm64.mk index b44a9a11..d9444d0e 100644 --- a/src/preprocessor.target.darwin-arm64.mk +++ b/src/preprocessor.target.darwin-arm64.mk @@ -126,6 +126,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -216,7 +218,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk index eed71374..b4746722 100644 --- a/src/preprocessor.target.darwin-mips.mk +++ b/src/preprocessor.target.darwin-mips.mk @@ -133,6 +133,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -230,7 +232,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk index 827630f8..a0b45a89 100644 --- a/src/preprocessor.target.darwin-x86.mk +++ b/src/preprocessor.target.darwin-x86.mk @@ -132,6 +132,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -228,7 +230,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.darwin-x86_64.mk b/src/preprocessor.target.darwin-x86_64.mk index 9486f178..e0267955 100644 --- a/src/preprocessor.target.darwin-x86_64.mk +++ b/src/preprocessor.target.darwin-x86_64.mk @@ -131,6 +131,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -226,7 +228,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk index 6e31961e..5791e303 100644 --- a/src/preprocessor.target.linux-arm.mk +++ b/src/preprocessor.target.linux-arm.mk @@ -138,6 +138,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -240,7 +242,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.linux-arm64.mk b/src/preprocessor.target.linux-arm64.mk index b44a9a11..d9444d0e 100644 --- a/src/preprocessor.target.linux-arm64.mk +++ b/src/preprocessor.target.linux-arm64.mk @@ -126,6 +126,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -216,7 +218,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk index eed71374..b4746722 100644 --- a/src/preprocessor.target.linux-mips.mk +++ b/src/preprocessor.target.linux-mips.mk @@ -133,6 +133,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -230,7 +232,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk index 827630f8..a0b45a89 100644 --- a/src/preprocessor.target.linux-x86.mk +++ b/src/preprocessor.target.linux-x86.mk @@ -132,6 +132,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -228,7 +230,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/preprocessor.target.linux-x86_64.mk b/src/preprocessor.target.linux-x86_64.mk index 9486f178..e0267955 100644 --- a/src/preprocessor.target.linux-x86_64.mk +++ b/src/preprocessor.target.linux-x86_64.mk @@ -131,6 +131,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -226,7 +228,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.darwin-arm.mk b/src/translator.target.darwin-arm.mk index 61923071..9a95bd2c 100644 --- a/src/translator.target.darwin-arm.mk +++ b/src/translator.target.darwin-arm.mk @@ -131,6 +131,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -236,7 +238,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.darwin-arm64.mk b/src/translator.target.darwin-arm64.mk index 7ed7b99a..4831b792 100644 --- a/src/translator.target.darwin-arm64.mk +++ b/src/translator.target.darwin-arm64.mk @@ -119,6 +119,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -212,7 +214,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.darwin-mips.mk b/src/translator.target.darwin-mips.mk index de13d11d..8be98ed9 100644 --- a/src/translator.target.darwin-mips.mk +++ b/src/translator.target.darwin-mips.mk @@ -126,6 +126,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -226,7 +228,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.darwin-x86.mk b/src/translator.target.darwin-x86.mk index 60a14730..b0becf7f 100644 --- a/src/translator.target.darwin-x86.mk +++ b/src/translator.target.darwin-x86.mk @@ -125,6 +125,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -224,7 +226,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.darwin-x86_64.mk b/src/translator.target.darwin-x86_64.mk index 0c717e67..f3d83ca6 100644 --- a/src/translator.target.darwin-x86_64.mk +++ b/src/translator.target.darwin-x86_64.mk @@ -124,6 +124,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -222,7 +224,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.linux-arm.mk b/src/translator.target.linux-arm.mk index 61923071..9a95bd2c 100644 --- a/src/translator.target.linux-arm.mk +++ b/src/translator.target.linux-arm.mk @@ -131,6 +131,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -236,7 +238,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.linux-arm64.mk b/src/translator.target.linux-arm64.mk index 7ed7b99a..4831b792 100644 --- a/src/translator.target.linux-arm64.mk +++ b/src/translator.target.linux-arm64.mk @@ -119,6 +119,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -212,7 +214,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.linux-mips.mk b/src/translator.target.linux-mips.mk index de13d11d..8be98ed9 100644 --- a/src/translator.target.linux-mips.mk +++ b/src/translator.target.linux-mips.mk @@ -126,6 +126,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -226,7 +228,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.linux-x86.mk b/src/translator.target.linux-x86.mk index 60a14730..b0becf7f 100644 --- a/src/translator.target.linux-x86.mk +++ b/src/translator.target.linux-x86.mk @@ -125,6 +125,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -224,7 +226,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator.target.linux-x86_64.mk b/src/translator.target.linux-x86_64.mk index 0c717e67..f3d83ca6 100644 --- a/src/translator.target.linux-x86_64.mk +++ b/src/translator.target.linux-x86_64.mk @@ -124,6 +124,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -222,7 +224,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.darwin-arm.mk b/src/translator_lib.target.darwin-arm.mk index 52572270..250d9077 100644 --- a/src/translator_lib.target.darwin-arm.mk +++ b/src/translator_lib.target.darwin-arm.mk @@ -188,6 +188,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -292,7 +294,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.darwin-arm64.mk b/src/translator_lib.target.darwin-arm64.mk index de63709d..26d9daf7 100644 --- a/src/translator_lib.target.darwin-arm64.mk +++ b/src/translator_lib.target.darwin-arm64.mk @@ -176,6 +176,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -268,7 +270,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.darwin-mips.mk b/src/translator_lib.target.darwin-mips.mk index a3383764..4f5a8b4f 100644 --- a/src/translator_lib.target.darwin-mips.mk +++ b/src/translator_lib.target.darwin-mips.mk @@ -183,6 +183,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -282,7 +284,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.darwin-x86.mk b/src/translator_lib.target.darwin-x86.mk index 1c3ed025..fbe45c46 100644 --- a/src/translator_lib.target.darwin-x86.mk +++ b/src/translator_lib.target.darwin-x86.mk @@ -182,6 +182,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -280,7 +282,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.darwin-x86_64.mk b/src/translator_lib.target.darwin-x86_64.mk index a9416fa2..58986301 100644 --- a/src/translator_lib.target.darwin-x86_64.mk +++ b/src/translator_lib.target.darwin-x86_64.mk @@ -181,6 +181,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -278,7 +280,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.linux-arm.mk b/src/translator_lib.target.linux-arm.mk index 52572270..250d9077 100644 --- a/src/translator_lib.target.linux-arm.mk +++ b/src/translator_lib.target.linux-arm.mk @@ -188,6 +188,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -292,7 +294,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.linux-arm64.mk b/src/translator_lib.target.linux-arm64.mk index de63709d..26d9daf7 100644 --- a/src/translator_lib.target.linux-arm64.mk +++ b/src/translator_lib.target.linux-arm64.mk @@ -176,6 +176,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -268,7 +270,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.linux-mips.mk b/src/translator_lib.target.linux-mips.mk index a3383764..4f5a8b4f 100644 --- a/src/translator_lib.target.linux-mips.mk +++ b/src/translator_lib.target.linux-mips.mk @@ -183,6 +183,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -282,7 +284,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.linux-x86.mk b/src/translator_lib.target.linux-x86.mk index 1c3ed025..fbe45c46 100644 --- a/src/translator_lib.target.linux-x86.mk +++ b/src/translator_lib.target.linux-x86.mk @@ -182,6 +182,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ @@ -280,7 +282,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) diff --git a/src/translator_lib.target.linux-x86_64.mk b/src/translator_lib.target.linux-x86_64.mk index a9416fa2..58986301 100644 --- a/src/translator_lib.target.linux-x86_64.mk +++ b/src/translator_lib.target.linux-x86_64.mk @@ -181,6 +181,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -278,7 +280,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-non-virtual-dtor +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) -- cgit v1.2.3 From b5af678b07f7424b41d5045a4dcde1c7cccbaa8b Mon Sep 17 00:00:00 2001 From: Geoff Lang Date: Fri, 19 Sep 2014 13:13:40 -0400 Subject: Use a D24S8 format to back GL_DEPTH_COMPONENT32_OES in D3D9. Looks like the D3D9 D32 format isn't available on most GPUs (and doesn't exist in D3D11) so back GL_DEPTH_COMPONENT32_OES with D24S8 instead to match D3D11. BUG=angle:750 Change-Id: Ifc9989930ac0a0e2386b931814c9f626fdb02a2c Reviewed-on: https://chromium-review.googlesource.com/219802 Reviewed-by: Shannon Woods Tested-by: Geoff Lang --- src/libGLESv2/renderer/d3d/d3d9/formatutils9.cpp | 11 ++- tests/angle_tests/DepthStencilFormatsTest.cpp | 96 ++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 tests/angle_tests/DepthStencilFormatsTest.cpp diff --git a/src/libGLESv2/renderer/d3d/d3d9/formatutils9.cpp b/src/libGLESv2/renderer/d3d/d3d9/formatutils9.cpp index 8e13b2e5..e90bb904 100644 --- a/src/libGLESv2/renderer/d3d/d3d9/formatutils9.cpp +++ b/src/libGLESv2/renderer/d3d/d3d9/formatutils9.cpp @@ -223,8 +223,17 @@ static D3D9FormatMap BuildD3D9FormatMap() // | Internal format | Texture format | Render format | Load function | InsertD3D9FormatInfo(&map, GL_NONE, D3DFMT_NULL, D3DFMT_NULL, UnreachableLoad ); + // We choose to downsample the GL_DEPTH_COMPONENT32_OES format to a 24-bit format because D3DFMT_D32 is not widely + // supported. We're allowed to do this because: + // - The ES spec 2.0.25 sec 3.7.1 states that we're allowed to store texture formats with internal format + // resolutions of our own choosing. + // - OES_depth_texture states that downsampling of the depth formats is allowed. + // - ANGLE_depth_texture does not state minimum required resolutions of the depth texture formats it + // introduces. + // In ES3 however, there are minimum resolutions for the texture formats and this would not be allowed. + InsertD3D9FormatInfo(&map, GL_DEPTH_COMPONENT16, D3DFMT_INTZ, D3DFMT_D24S8, UnreachableLoad ); - InsertD3D9FormatInfo(&map, GL_DEPTH_COMPONENT32_OES, D3DFMT_INTZ, D3DFMT_D32, UnreachableLoad ); + InsertD3D9FormatInfo(&map, GL_DEPTH_COMPONENT32_OES, D3DFMT_INTZ, D3DFMT_D24X8, UnreachableLoad ); InsertD3D9FormatInfo(&map, GL_DEPTH24_STENCIL8_OES, D3DFMT_INTZ, D3DFMT_D24S8, UnreachableLoad ); InsertD3D9FormatInfo(&map, GL_STENCIL_INDEX8, D3DFMT_UNKNOWN, D3DFMT_D24S8, UnreachableLoad ); // TODO: What's the texture format? diff --git a/tests/angle_tests/DepthStencilFormatsTest.cpp b/tests/angle_tests/DepthStencilFormatsTest.cpp new file mode 100644 index 00000000..56d5210a --- /dev/null +++ b/tests/angle_tests/DepthStencilFormatsTest.cpp @@ -0,0 +1,96 @@ +#include "ANGLETest.h" + +class DepthStencilFormatsTest : public ANGLETest +{ +protected: + DepthStencilFormatsTest() + { + setWindowWidth(128); + setWindowHeight(128); + setConfigRedBits(8); + setConfigGreenBits(8); + setConfigBlueBits(8); + setConfigAlphaBits(8); + setClientVersion(2); + } + + bool checkTexImageFormatSupport(GLenum format, GLenum type) + { + EXPECT_GL_NO_ERROR(); + + GLuint tex = 0; + glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + glTexImage2D(GL_TEXTURE_2D, 0, format, 1, 1, 0, format, type, NULL); + glDeleteTextures(1, &tex); + + return (glGetError() == GL_NO_ERROR); + } + + bool checkTexStorageFormatSupport(GLenum internalFormat) + { + EXPECT_GL_NO_ERROR(); + + GLuint tex = 0; + glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + glTexStorage2DEXT(GL_TEXTURE_2D, 1, internalFormat, 1, 1); + glDeleteTextures(1, &tex); + + return (glGetError() == GL_NO_ERROR); + } + + bool checkRenderbufferFormatSupport(GLenum internalFormat) + { + EXPECT_GL_NO_ERROR(); + + GLuint rb = 0; + glGenRenderbuffers(1, &rb); + glBindRenderbuffer(GL_RENDERBUFFER, rb); + glRenderbufferStorage(GL_RENDERBUFFER, internalFormat, 1, 1); + glDeleteRenderbuffers(1, &rb); + + return (glGetError() == GL_NO_ERROR); + } + + virtual void SetUp() + { + ANGLETest::SetUp(); + } + + virtual void TearDown() + { + ANGLETest::TearDown(); + } +}; + +TEST_F(DepthStencilFormatsTest, DepthTexture) +{ + bool shouldHaveTextureSupport = extensionEnabled("GL_ANGLE_depth_texture"); + EXPECT_EQ(shouldHaveTextureSupport, checkTexImageFormatSupport(GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT)); + EXPECT_EQ(shouldHaveTextureSupport, checkTexImageFormatSupport(GL_DEPTH_COMPONENT, GL_UNSIGNED_INT)); + + if (extensionEnabled("GL_EXT_texture_storage")) + { + EXPECT_EQ(shouldHaveTextureSupport, checkTexStorageFormatSupport(GL_DEPTH_COMPONENT16)); + EXPECT_EQ(shouldHaveTextureSupport, checkTexStorageFormatSupport(GL_DEPTH_COMPONENT32_OES)); + } +} + +TEST_F(DepthStencilFormatsTest, PackedDepthStencil) +{ + // Expected to fail in D3D9 if GL_OES_packed_depth_stencil is not present. + // Expected to fail in D3D11 if GL_OES_packed_depth_stencil or GL_ANGLE_depth_texture is not present. + + bool shouldHaveRenderbufferSupport = extensionEnabled("GL_OES_packed_depth_stencil"); + EXPECT_EQ(shouldHaveRenderbufferSupport, checkRenderbufferFormatSupport(GL_DEPTH24_STENCIL8_OES)); + + bool shouldHaveTextureSupport = extensionEnabled("GL_OES_packed_depth_stencil") && + extensionEnabled("GL_ANGLE_depth_texture"); + EXPECT_EQ(shouldHaveTextureSupport, checkTexImageFormatSupport(GL_DEPTH_STENCIL_OES, GL_UNSIGNED_INT_24_8_OES)); + + if (extensionEnabled("GL_EXT_texture_storage")) + { + EXPECT_EQ(shouldHaveTextureSupport, checkTexStorageFormatSupport(GL_DEPTH24_STENCIL8_OES)); + } +} -- cgit v1.2.3