AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix vulkan dual source blending

Browse Source 
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
This commit is contained in:
egdaniel 2016-04-05 11:00:29 -07:00 committed by Commit bot
parent f3261afed2
commit 3a15fd4a9a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gpu/vk/GrVkCaps.cpp
View File

@ -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) {

5
src/gpu/vk/GrVkPipelineStateBuilder.cpp
View File

@ -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,