diff options
author | Mike Reed <reed@google.com> | 2017-06-21 03:34:39 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-21 03:34:49 +0000 |
commit | 84cda40bd7e98f4e19574c6e946395e244901408 (patch) | |
tree | c4bccaca446ff6b894ba85b42fc4874ce76420ef /tests/SkSLGLSLTest.cpp | |
parent | f66d28dfb25127ff073e2e9549c6985785a65afa (diff) |
Revert "Revert "Revert "implemented mustImplementGSInvocationsWithLoop workaround in sksl"""
This reverts commit f66d28dfb25127ff073e2e9549c6985785a65afa.
Reason for revert: breaks chrome-roll?
https://chromium-review.googlesource.com/c/542000
Original change's description:
> Revert "Revert "implemented mustImplementGSInvocationsWithLoop workaround in sksl""
>
> This reverts commit 8ea60736aaa92cf3cf24705fb356e9e09e85b1fd.
>
> Bug: skia:
> Change-Id: If77035e03430b469c2682788610b33ae0aefbe1f
> Reviewed-on: https://skia-review.googlesource.com/20053
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=csmartdalton@google.com,ethannicholas@google.com
Change-Id: Iedada4e4b9facb37b792a655947d76eb0f7b22e4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20361
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/SkSLGLSLTest.cpp')
-rw-r--r-- | tests/SkSLGLSLTest.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/tests/SkSLGLSLTest.cpp b/tests/SkSLGLSLTest.cpp index a4a3c0e04f..2ea6c7ec71 100644 --- a/tests/SkSLGLSLTest.cpp +++ b/tests/SkSLGLSLTest.cpp @@ -1393,39 +1393,4 @@ DEF_TEST(SkSLDeadLoopVar, r) { ); } -DEF_TEST(SkSLInvocations, r) { - test(r, - "layout(points) in;" - "layout(invocations = 2) in;" - "layout(line_strip, max_vertices = 2) out;" - "void test() {" - "gl_Position = sk_in[0].gl_Position + vec4(0.5, 0, 0, sk_InvocationID);" - "EmitVertex();" - "}" - "void main() {" - "gl_Position = sk_in[0].gl_Position + vec4(-0.5, 0, 0, sk_InvocationID);" - "EmitVertex();" - "}", - *SkSL::ShaderCapsFactory::MustImplementGSInvocationsWithLoop(), - "#version 400\n" - "int sk_InvocationID;\n" - "layout (points) in ;\n" - "layout (line_strip, max_vertices = 4) out ;\n" - "void test() {\n" - " gl_Position = gl_in[0].gl_Position + vec4(0.5, 0.0, 0.0, float(sk_InvocationID));\n" - " EmitVertex();\n" - "}\n" - "void _invoke() {\n" - " gl_Position = gl_in[0].gl_Position + vec4(-0.5, 0.0, 0.0, float(sk_InvocationID));\n" - " EmitVertex();\n" - "}\n" - "void main() {\n" - " for (sk_InvocationID = 0;sk_InvocationID < 2; sk_InvocationID++) {\n" - " _invoke();\n" - " EndPrimitive();\n" - " }\n" - "}\n", - SkSL::Program::kGeometry_Kind); -} - #endif |