commit d49947fd6f6bd72b6db842db654432df21ed4cda
author Greg Daniel <egdaniel@google.com> Fri Mar 16 08:52:32 2018 -0400
committer Greg Daniel <egdaniel@google.com> Fri Mar 16 20:00:13 2018 +0000
tree 378b1e90d9801add93205d734e1a9ef3b4974dce
parent a5876976260b1b307e357ba3a015ae17eb5b026c

Fix Vulkan Copy as draw shader

Bug: skia:7663
Change-Id: I745900ccc56c697e4abb982e921d99bc28502b33
Reviewed-on: https://skia-review.googlesource.com/114687
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
(cherry picked from commit e464160f6969d28d0e8c76c493f325e3a716c4d2)
Reviewed-on: https://skia-review.googlesource.com/114801
Reviewed-by: Hal Canary <halcanary@google.com>

src/gpu/vk/GrVkCopyManager.cpp

diff --git a/src/gpu/vk/GrVkCopyManager.cpp b/src/gpu/vk/GrVkCopyManager.cpp
index 3093c69..da19d10 100644
--- a/src/gpu/vk/GrVkCopyManager.cpp
+++ b/src/gpu/vk/GrVkCopyManager.cpp
@@ -65,11 +65,10 @@
 
         "layout(set = 1, binding = 0) uniform sampler2D uTextureSampler;"
         "layout(location = 1) in half2 vTexCoord;"
-        "layout(location = 0, index = 0) out half4 fsColorOut;"
 
         "// Copy Program FS\n"
         "void main() {"
-            "fsColorOut = texture(uTextureSampler, vTexCoord);"
+            "sk_FragColor = texture(uTextureSampler, vTexCoord);"
         "}"
     );
 

tests/VkMakeCopyPipelineTest.cpp

diff --git a/tests/VkMakeCopyPipelineTest.cpp b/tests/VkMakeCopyPipelineTest.cpp
index f9a0ec6..2c82c03 100644
--- a/tests/VkMakeCopyPipelineTest.cpp
+++ b/tests/VkMakeCopyPipelineTest.cpp
@@ -55,11 +55,10 @@
 
             "layout(set = 1, binding = 0) uniform sampler2D uTextureSampler;"
             "layout(location = 1) in half2 vTexCoord;"
-            "layout(location = 0, index = 0) out half4 fsColorOut;"
 
             "// Copy Program FS\n"
             "void main() {"
-            "fsColorOut = texture(uTextureSampler, vTexCoord);"
+            "sk_FragColor = texture(uTextureSampler, vTexCoord);"
             "}";
 
         SkSL::Program::Settings settings;