diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2018-06-12 11:05:59 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-12 19:16:03 +0000 |
commit | d9d33c33dee064da260301faa313703e465d44c5 (patch) | |
tree | f2e9a592acde1715d71381d8ff7c97fdaf58edac /src/sksl/SkSLInterpreter.cpp | |
parent | 22be4c4801f957f2820b9001b02b892f4b87a157 (diff) |
renamed SkSL's assert macros
Since SkSL needs to run outside of Skia, it was originally using its
own ASSERT macro, which mapped to SkASSERT when inside of Skia. This is
causing conflicts with one or two other ASSERT macros defined around
Skia, so to avoid that I am switching SkSL over to just use Skia's
standard naming for these macros.
Bug: skia:
Change-Id: I115435d7282da03d076c6080f7b13d1972b9eb9f
Reviewed-on: https://skia-review.googlesource.com/134322
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLInterpreter.cpp')
-rw-r--r-- | src/sksl/SkSLInterpreter.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/sksl/SkSLInterpreter.cpp b/src/sksl/SkSLInterpreter.cpp index 45e340a300..5879274dd7 100644 --- a/src/sksl/SkSLInterpreter.cpp +++ b/src/sksl/SkSLInterpreter.cpp @@ -38,7 +38,7 @@ void Interpreter::run() { } } } - ASSERT(false); + SkASSERT(false); } static int SizeOf(const Type& type) { @@ -87,7 +87,7 @@ void Interpreter::runStatement() { if (!b.fStatements.size()) { break; } - ASSERT(index < b.fStatements.size()); + SkASSERT(index < b.fStatements.size()); if (index < b.fStatements.size() - 1) { fCurrentIndex.push_back({ &b, index + 1 }); } @@ -95,18 +95,18 @@ void Interpreter::runStatement() { break; } case Statement::kBreak_Kind: - ASSERT(index == 0); + SkASSERT(index == 0); abort(); case Statement::kContinue_Kind: - ASSERT(index == 0); + SkASSERT(index == 0); abort(); case Statement::kDiscard_Kind: - ASSERT(index == 0); + SkASSERT(index == 0); abort(); case Statement::kDo_Kind: abort(); case Statement::kExpression_Kind: - ASSERT(index == 0); + SkASSERT(index == 0); this->evaluate(*((const ExpressionStatement&) stmt).fExpression); break; case Statement::kFor_Kind: { @@ -136,7 +136,7 @@ void Interpreter::runStatement() { fCurrentIndex.push_back({ &f, 1 }); break; default: - ASSERT(false); + SkASSERT(false); } break; } @@ -152,15 +152,15 @@ void Interpreter::runStatement() { break; } case Statement::kNop_Kind: - ASSERT(index == 0); + SkASSERT(index == 0); break; case Statement::kReturn_Kind: - ASSERT(index == 0); + SkASSERT(index == 0); abort(); case Statement::kSwitch_Kind: abort(); case Statement::kVarDeclarations_Kind: - ASSERT(index == 0); + SkASSERT(index == 0); for (const auto& decl :((const VarDeclarationsStatement&) stmt).fDeclaration->fVars) { const Variable* var = ((VarDeclaration&) *decl).fVar; StackIndex pos = this->stackAlloc(SizeOf(var->fType)); @@ -197,8 +197,8 @@ Interpreter::StackIndex Interpreter::getLValue(const Expression& expr) { case Expression::kSwizzle_Kind: break; case Expression::kVariableReference_Kind: - ASSERT(fVars.size()); - ASSERT(fVars.back().find(&((VariableReference&) expr).fVariable) != + SkASSERT(fVars.size()); + SkASSERT(fVars.back().find(&((VariableReference&) expr).fVariable) != fVars.back().end()); return fVars.back()[&((VariableReference&) expr).fVariable]; case Expression::kTernary_Kind: { @@ -234,13 +234,13 @@ static void do_callback(SkJumper_CallbackCtx* raw, int activePixels) { void Interpreter::appendStage(const AppendStage& a) { switch (a.fStage) { case SkRasterPipeline::matrix_4x5: { - ASSERT(a.fArguments.size() == 1); + SkASSERT(a.fArguments.size() == 1); StackIndex transpose = evaluate(*a.fArguments[0]).fInt; fPipeline.append(SkRasterPipeline::matrix_4x5, &fStack[transpose]); break; } case SkRasterPipeline::callback: { - ASSERT(a.fArguments.size() == 1); + SkASSERT(a.fArguments.size() == 1); CallbackCtx* ctx = new CallbackCtx(); ctx->fInterpreter = this; ctx->fn = do_callback; @@ -430,7 +430,7 @@ Interpreter::Value Interpreter::evaluate(const Expression& expr) { if (Token::PLUSPLUS == p.fOperator) { ++fStack[lvalue].fFloat; } else { - ASSERT(Token::MINUSMINUS == p.fOperator); + SkASSERT(Token::MINUSMINUS == p.fOperator); --fStack[lvalue].fFloat; } break; @@ -438,7 +438,7 @@ Interpreter::Value Interpreter::evaluate(const Expression& expr) { if (Token::PLUSPLUS == p.fOperator) { ++fStack[lvalue].fInt; } else { - ASSERT(Token::MINUSMINUS == p.fOperator); + SkASSERT(Token::MINUSMINUS == p.fOperator); --fStack[lvalue].fInt; } break; @@ -452,8 +452,8 @@ Interpreter::Value Interpreter::evaluate(const Expression& expr) { case Expression::kSwizzle_Kind: break; case Expression::kVariableReference_Kind: - ASSERT(fVars.size()); - ASSERT(fVars.back().find(&((VariableReference&) expr).fVariable) != + SkASSERT(fVars.size()); + SkASSERT(fVars.back().find(&((VariableReference&) expr).fVariable) != fVars.back().end()); return fStack[fVars.back()[&((VariableReference&) expr).fVariable]]; case Expression::kTernary_Kind: { |