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>
diff --git a/src/sksl/SkSLInterpreter.cpp b/src/sksl/SkSLInterpreter.cpp
index 45e340a..5879274 100644
--- a/src/sksl/SkSLInterpreter.cpp
+++ b/src/sksl/SkSLInterpreter.cpp
@@ -38,7 +38,7 @@
}
}
}
- ASSERT(false);
+ SkASSERT(false);
}
static int SizeOf(const Type& type) {
@@ -87,7 +87,7 @@
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 @@
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 @@
fCurrentIndex.push_back({ &f, 1 });
break;
default:
- ASSERT(false);
+ SkASSERT(false);
}
break;
}
@@ -152,15 +152,15 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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: {