diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2018-04-30 11:04:40 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-30 23:15:34 +0000 |
| commit | 5cd67002d77a12526bb3dbc88f3abae24dfa0a07 (patch) | |
| tree | 115084d090d5a0dcf066673ff9865ef1383e6bb0 /src/gpu/ccpr/GrCCPathProcessor.cpp | |
| parent | 0ce19fa0b19ddef781d01c03a329a41fdb934a8e (diff) | |
ccpr: Avoid inline array definitions
MoltenVK currently has an issue translating these to MSL:
https://github.com/KhronosGroup/SPIRV-Cross/issues/558
Bug: skia:
Change-Id: Id210780672f8ec3920f8087bd60a9108e8fb0256
Reviewed-on: https://skia-review.googlesource.com/124525
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/ccpr/GrCCPathProcessor.cpp')
| -rw-r--r-- | src/gpu/ccpr/GrCCPathProcessor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/ccpr/GrCCPathProcessor.cpp b/src/gpu/ccpr/GrCCPathProcessor.cpp index 4841ed21f1..55cbcaba6e 100644 --- a/src/gpu/ccpr/GrCCPathProcessor.cpp +++ b/src/gpu/ccpr/GrCCPathProcessor.cpp @@ -179,14 +179,14 @@ void GLSLPathProcessor::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { // N[0] is the normal for the edge we are intersecting from the regular bounding box, pointing // out of the octagon. - v->codeAppendf("float2 refpt = float2[2](%s.xy, %s.zw)[sk_VertexID >> 2];", + v->codeAppendf("float2 refpt = (0 == sk_VertexID >> 2) ? %s.xy : %s.zw;", proc.getInstanceAttrib(InstanceAttribs::kDevBounds).fName, proc.getInstanceAttrib(InstanceAttribs::kDevBounds).fName); v->codeAppendf("refpt += N[0] * %f;", kAABloatRadius); // bloat for AA. // N[1] is the normal for the edge we are intersecting from the 45-degree bounding box, pointing // out of the octagon. - v->codeAppendf("float2 refpt45 = float2[2](%s.xy, %s.zw)[((sk_VertexID + 1) >> 2) & 1];", + v->codeAppendf("float2 refpt45 = (0 == ((sk_VertexID + 1) & (1 << 2))) ? %s.xy : %s.zw;", proc.getInstanceAttrib(InstanceAttribs::kDevBounds45).fName, proc.getInstanceAttrib(InstanceAttribs::kDevBounds45).fName); v->codeAppendf("refpt45 *= float2x2(.5,.5,-.5,.5);"); // transform back to device space. |