diff options
author | Greg Daniel <egdaniel@google.com> | 2018-03-16 08:52:32 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-16 13:36:51 +0000 |
commit | e464160f6969d28d0e8c76c493f325e3a716c4d2 (patch) | |
tree | 79d2c284e11ef5185cc09439565a374eca4c4e67 | |
parent | 874b5357daa72c9fcdc14fc425b63ebc2219c034 (diff) |
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>
-rw-r--r-- | src/gpu/vk/GrVkCopyManager.cpp | 3 | ||||
-rw-r--r-- | tests/VkMakeCopyPipelineTest.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkCopyManager.cpp b/src/gpu/vk/GrVkCopyManager.cpp index 02d1ca0a91..f22d99b9eb 100644 --- a/src/gpu/vk/GrVkCopyManager.cpp +++ b/src/gpu/vk/GrVkCopyManager.cpp @@ -65,11 +65,10 @@ bool GrVkCopyManager::createCopyProgram(GrVkGpu* gpu) { "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);" "}" ); diff --git a/tests/VkMakeCopyPipelineTest.cpp b/tests/VkMakeCopyPipelineTest.cpp index 77359cd539..cb3cbe9e30 100644 --- a/tests/VkMakeCopyPipelineTest.cpp +++ b/tests/VkMakeCopyPipelineTest.cpp @@ -55,11 +55,10 @@ public: "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; |