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

Fix SkSL standalone compile errors

Browse Source 
With clang-cl, at least, I need these changes to build with
skia_compile_processors = true

Change-Id: I9221355f135ee66af0b172ce7ac56e4ea077214e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218539
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
This commit is contained in:
Brian Osman 2019-06-05 10:28:45 -04:00 committed by Skia Commit-Bot
parent de4c58cbac
commit 95253bd0ac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sksl/SkSLByteCodeGenerator.cpp
View File

@ -8,6 +8,8 @@
#include "src/sksl/SkSLByteCodeGenerator.h"
#include "src/sksl/SkSLInterpreter.h"
#include <algorithm>
namespace SkSL {
ByteCodeGenerator::ByteCodeGenerator(const Context* context, const Program* program, ErrorReporter* errors,

4
src/sksl/SkSLDefines.h
View File

@ -18,8 +18,8 @@
#endif // SKSL_STANDALONE
#ifdef SKSL_STANDALONE
#define SkASSERT(x) if (!(x)) abort();
#define SkAssertResult(x) if (!(x)) abort();
#define SkASSERT(x) do { if (!(x)) abort(); } while (false)
#define SkAssertResult(x) do { if (!(x)) abort(); } while (false)
#define SkDEBUGCODE(...) __VA_ARGS__
#else
#include "include/core/SkTypes.h"