aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/vk/GrVkCaps.cpp
diff options
context:
space:
mode:
authorGravatar egdaniel <egdaniel@google.com>2016-03-30 12:06:48 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-30 12:06:48 -0700
commitd632bb4dfc184d7c523bb436940c182ed42551ea (patch)
tree75124748c5f9207816725f601c1326a8b788561b /src/gpu/vk/GrVkCaps.cpp
parent128245c61d56abcacdb152ad08038c5d9c919df0 (diff)
Enable dual source blending for Vulkan
Diffstat (limited to 'src/gpu/vk/GrVkCaps.cpp')
-rw-r--r--src/gpu/vk/GrVkCaps.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 8f46408706..88ff8ee3e0 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -62,7 +62,9 @@ void GrVkCaps::init(const GrContextOptions& contextOptions, const GrVkInterface*
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);
@@ -147,10 +149,9 @@ void GrVkCaps::initGLSLCaps(const VkPhysicalDeviceProperties& properties,
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 =