diff options
| author |  egdaniel <egdaniel@google.com> | 2016-04-05 11:00:29 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-05 11:00:29 -0700 |
| commit | 3a15fd4a9a019dc781368c26499ff899c2f03e3f (patch) | |
| tree | cea05d3efc14d27e2eb6a80f75b18e91cabfaec3 /src/gpu/vk | |
| parent | f3261afed2b2a7853a3f94a7e5b0c11683c09579 (diff) | |
Fix vulkan dual source blending
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1856283003
Review URL: https://codereview.chromium.org/1856283003
Diffstat (limited to 'src/gpu/vk')
| -rw-r--r-- | src/gpu/vk/GrVkCaps.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkPipelineStateBuilder.cpp | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp index 7a1577e66c..b72a512523 100644 --- a/src/gpu/vk/GrVkCaps.cpp +++ b/src/gpu/vk/GrVkCaps.cpp @@ -127,7 +127,8 @@ void GrVkCaps::initGrCaps(const VkPhysicalDeviceProperties& properties, void GrVkCaps::initGLSLCaps(const VkPhysicalDeviceProperties& properties, uint32_t featureFlags) { GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get()); - glslCaps->fVersionDeclString = "#version 310 es\n"; + glslCaps->fVersionDeclString = "#version 330\n"; + // fConfigOutputSwizzle will default to RGBA so we only need to set it for alpha only config. for (int i = 0; i < kGrPixelConfigCnt; ++i) { diff --git a/src/gpu/vk/GrVkPipelineStateBuilder.cpp b/src/gpu/vk/GrVkPipelineStateBuilder.cpp index 6d46ea91b5..f9654c3af5 100644 --- a/src/gpu/vk/GrVkPipelineStateBuilder.cpp +++ b/src/gpu/vk/GrVkPipelineStateBuilder.cpp @@ -50,11 +50,11 @@ const GrGLSLCaps* GrVkPipelineStateBuilder::glslCaps() const { } void GrVkPipelineStateBuilder::finalizeFragmentOutputColor(GrGLSLShaderVar& outputColor) { - outputColor.setLayoutQualifier("location = 0"); + outputColor.setLayoutQualifier("location = 0, index = 0"); } void GrVkPipelineStateBuilder::finalizeFragmentSecondaryColor(GrGLSLShaderVar& outputColor) { - outputColor.setLayoutQualifier("location = 1"); + outputColor.setLayoutQualifier("location = 0, index = 1"); } VkShaderStageFlags visibility_to_vk_stage_flags(uint32_t visibility) { @@ -109,7 +109,6 @@ bool GrVkPipelineStateBuilder::CreateVkShaderModule(const GrVkGpu* gpu, shaderc_compiler_t compiler = gpu->shadercCompiler(); shaderc_compile_options_t options = shaderc_compile_options_initialize(); - shaderc_compile_options_set_forced_version_profile(options, 140, shaderc_profile_none); shaderc_shader_kind shadercStage = vk_shader_stage_to_shaderc_kind(stage); result = shaderc_compile_into_spv(compiler, |