aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Chris Dalton <csmartdalton@google.com>2017-07-07 11:00:48 -0600
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-09 17:31:27 +0000
commit33607c614ff93f93985ecdfbd198fb75efb569b0 (patch)
tree9ac83547f094f55c24aef78679f33b0ce2a680c4
parent8545915d625847675b0ac650accc4420531fe39f (diff)
Add missing checks for geometry shader stages in GrVkUtil.cpp
Bug: skia: Change-Id: I30cb6d5ee5016536537c48346c58ef4cf19f16c5 Reviewed-on: https://skia-review.googlesource.com/21845 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
-rw-r--r--src/gpu/vk/GrVkUtil.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gpu/vk/GrVkUtil.cpp b/src/gpu/vk/GrVkUtil.cpp
index c56a4fb6fb..84406c8ee8 100644
--- a/src/gpu/vk/GrVkUtil.cpp
+++ b/src/gpu/vk/GrVkUtil.cpp
@@ -231,6 +231,9 @@ SkSL::Program::Kind vk_shader_stage_to_skiasl_kind(VkShaderStageFlagBits stage)
if (VK_SHADER_STAGE_VERTEX_BIT == stage) {
return SkSL::Program::kVertex_Kind;
}
+ if (VK_SHADER_STAGE_GEOMETRY_BIT == stage) {
+ return SkSL::Program::kGeometry_Kind;
+ }
SkASSERT(VK_SHADER_STAGE_FRAGMENT_BIT == stage);
return SkSL::Program::kFragment_Kind;
}
@@ -239,6 +242,9 @@ VkShaderStageFlagBits skiasl_kind_to_vk_shader_stage(SkSL::Program::Kind kind) {
if (SkSL::Program::kVertex_Kind == kind) {
return VK_SHADER_STAGE_VERTEX_BIT;
}
+ if (SkSL::Program::kGeometry_Kind == kind) {
+ return VK_SHADER_STAGE_GEOMETRY_BIT;
+ }
SkASSERT(SkSL::Program::kFragment_Kind == kind);
return VK_SHADER_STAGE_FRAGMENT_BIT;
}