diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-03-22 10:10:44 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-22 14:45:54 +0000 |
| commit | 9eded2c211773133b86a964b357404ae6b021d7d (patch) | |
| tree | 3d7be5e4415e1c87b2892b4a38e33e0a5a04e9ad | |
| parent | dab15f7a02ddaa2a6977a14d5d04955bd39350ab (diff) | |
switched SPIR-V vertexid to vertexindex
Bug: skia:
Change-Id: I32c10e2874feea63d7fa048057ef57e27d5874bc
Reviewed-on: https://skia-review.googlesource.com/115880
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
| -rw-r--r-- | src/sksl/SkSLCompiler.h | 4 | ||||
| -rw-r--r-- | src/sksl/sksl_vert.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/SkSLCompiler.h b/src/sksl/SkSLCompiler.h index 384562fe3e..9f8ef4f18a 100644 --- a/src/sksl/SkSLCompiler.h +++ b/src/sksl/SkSLCompiler.h @@ -26,8 +26,8 @@ #define SK_TEXTURESAMPLERS_BUILTIN 10006 #define SK_OUT_BUILTIN 10007 #define SK_FRAGCOORD_BUILTIN 15 -#define SK_VERTEXID_BUILTIN 5 -#define SK_INSTANCEID_BUILTIN 6 +#define SK_VERTEXID_BUILTIN 42 +#define SK_INSTANCEID_BUILTIN 43 #define SK_CLIPDISTANCE_BUILTIN 3 #define SK_INVOCATIONID_BUILTIN 8 #define SK_POSITION_BUILTIN 0 diff --git a/src/sksl/sksl_vert.inc b/src/sksl/sksl_vert.inc index da2a1a2513..86db5d2c24 100644 --- a/src/sksl/sksl_vert.inc +++ b/src/sksl/sksl_vert.inc @@ -8,7 +8,7 @@ out sk_PerVertex { layout(builtin=3) float sk_ClipDistance[1]; }; -layout(builtin=5) in int sk_VertexID; -layout(builtin=6) in int sk_InstanceID; +layout(builtin=42) in int sk_VertexID; +layout(builtin=43) in int sk_InstanceID; ) |