Enable dual source blending for Vulkan

src/gpu/vk/GrVkCaps.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrVkCaps.h"
 
 #include "GrVkUtil.h"
@@ skipping 44 matching lines @@
     VkPhysicalDeviceMemoryProperties memoryProperties;
     GR_VK_CALL(vkInterface, GetPhysicalDeviceMemoryProperties(physDev, &memoryProperties));
 
     this->initGrCaps(properties, memoryProperties, featureFlags);
     this->initGLSLCaps(properties, featureFlags);
     this->initConfigTexturableTable(vkInterface, physDev);
     this->initConfigRenderableTable(vkInterface, physDev);
     this->initStencilFormats(vkInterface, physDev);
 
     if (SkToBool(extensionFlags & kNV_glsl_shader_GrVkExtensionFlag)) {
-        fCanUseGLSLForShaderModule = true;
+        // Currently disabling this feature since it does not play well with validation layers which
+        // expect a SPIR-V shader
+        // fCanUseGLSLForShaderModule = true;
     }
 
     this->applyOptionsOverrides(contextOptions);
     GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get());
     glslCaps->applyOptionsOverrides(contextOptions);
 }
 
 int get_max_sample_count(VkSampleCountFlags flags) {
     SkASSERT(flags & VK_SAMPLE_COUNT_1_BIT);
     if (!(flags & VK_SAMPLE_COUNT_2_BIT)) {
@@ skipping 64 matching lines @@
     }
 
     // Vulkan is based off ES 3.0 so the following should all be supported
     glslCaps->fUsesPrecisionModifiers = true;
     glslCaps->fFlatInterpolationSupport = true;
 
     // GrShaderCaps
 
     glslCaps->fShaderDerivativeSupport = true;
     glslCaps->fGeometryShaderSupport = SkToBool(featureFlags & kGeometryShader_GrVkFeatureFlag);
-#if 0
-    // For now disabling dual source blending till we get it hooked up in the rest of system
+
     glslCaps->fDualSourceBlendingSupport = SkToBool(featureFlags & kDualSrcBlend_GrVkFeatureFlag);
-#endif
+
     glslCaps->fIntegerSupport = true;
 
     glslCaps->fMaxVertexSamplers =
     glslCaps->fMaxGeometrySamplers =
     glslCaps->fMaxFragmentSamplers = SkTMin(properties.limits.maxPerStageDescriptorSampledImages,
                                             properties.limits.maxPerStageDescriptorSamplers);
     glslCaps->fMaxCombinedSamplers = SkTMin(properties.limits.maxDescriptorSetSampledImages,
                                             properties.limits.maxDescriptorSetSamplers);
 }
 
@@ skipping 110 matching lines @@
                   // internal Format             stencil bits      total bits        packed?
         gS8    = { VK_FORMAT_S8_UINT,            8,                 8,               false },
         gD24S8 = { VK_FORMAT_D24_UNORM_S8_UINT,  8,                32,               true };
 
     // I'm simply assuming that these two will be supported since they are used in example code.
     // TODO: Actaully figure this out
     SET_CONFIG_CAN_STENCIL(gS8);
     SET_CONFIG_CAN_STENCIL(gD24S8);
 }