AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve error reporting from SkSL include files.

Browse Source 
Rather than showing a generic `assert(!fErrorCount)` message, this will
put the actual error message in the IDE error log.

Example: http://screen/7hPTTFronJV3ssb

Change-Id: Ic05f354281275d2aca3e006035b01efae29302e3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323098
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
John Stiles 2020-10-06 13:37:52 -04:00 committed by Skia Commit-Bot
parent 3c70f0bf12
commit 88f3b68ec2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sksl/SkSLCompiler.cpp
View File

@ -412,8 +412,8 @@ void Compiler::processIncludeFile(Program::Kind kind, const char* path,
fIRGenerator->fCanInline = true; fIRGenerator->fCanInline = true;
if (this->fErrorCount) { if (this->fErrorCount) {
printf("Unexpected errors: %s\n", this->fErrorText.c_str()); printf("Unexpected errors: %s\n", this->fErrorText.c_str());
SkDEBUGFAILF("%s %s\n", path, this->fErrorText.c_str());
} }
SkASSERT(!fErrorCount);
*outSymbolTable = fIRGenerator->fSymbolTable; *outSymbolTable = fIRGenerator->fSymbolTable;
#ifdef SK_DEBUG #ifdef SK_DEBUG
fSource = nullptr; fSource = nullptr;