Vulkan: Fix issue in blending factor conversions

The blend factor were not converted correctly from GL enum types to their VK equivalents. I found this by running many dEQP tests related to blending. Bug:angleproject:2346 Change-Id: I3c332bb5e5c44d2bec4ff9d62e0df2421507e136 Reviewed-on: https://chromium-review.googlesource.com/956241 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Fix issue in blending factor conversions
1505c750 · Luc Ferron · Commit Bot · 5b772312 · 1505c750
Commit 1505c750 authored Mar 09, 2018 by Luc Ferron Committed by Commit Bot Mar 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 44 additions and 5 deletions

vk_cache_utils.cpp src/libANGLE/renderer/vulkan/vk_cache_utils.cpp +44 -5

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
@@ -41,6 +41,46 @@ uint8_t PackGLBlendOp(GLenum blendOp)
    }
 }
+uint8_t PackGLBlendFactor(GLenum blendFactor)
+{
+    switch (blendFactor)
+    {
+        case GL_ZERO:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ZERO);
+        case GL_ONE:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE);
+        case GL_SRC_COLOR:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_SRC_COLOR);
+        case GL_DST_COLOR:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_DST_COLOR);
+        case GL_ONE_MINUS_SRC_COLOR:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR);
+        case GL_SRC_ALPHA:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_SRC_ALPHA);
+        case GL_ONE_MINUS_SRC_ALPHA:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA);
+        case GL_DST_ALPHA:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_DST_ALPHA);
+        case GL_ONE_MINUS_DST_ALPHA:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA);
+        case GL_ONE_MINUS_DST_COLOR:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_DST_COLOR);
+        case GL_SRC_ALPHA_SATURATE:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_SRC_ALPHA_SATURATE);
+        case GL_CONSTANT_COLOR:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_CONSTANT_COLOR);
+        case GL_CONSTANT_ALPHA:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_CONSTANT_ALPHA);
+        case GL_ONE_MINUS_CONSTANT_COLOR:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR);
+        case GL_ONE_MINUS_CONSTANT_ALPHA:
+            return static_cast<uint8_t>(VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA);
+        default:
+            UNREACHABLE();
+            return 0;
+    }
+}
 VkSampleCountFlagBits ConvertSamples(GLint sampleCount)
 {
    switch (sampleCount)
@@ -647,11 +687,10 @@ void PipelineDesc::updateBlendFuncs(const gl::BlendState &blendState)
 {
    for (auto &blendAttachmentState : mColorBlendStateInfo.attachments)
    {
-        blendAttachmentState.srcColorBlendFactor = static_cast<uint8_t>(blendState.sourceBlendRGB);
+        blendAttachmentState.srcColorBlendFactor = PackGLBlendFactor(blendState.sourceBlendRGB);
-        blendAttachmentState.dstColorBlendFactor = static_cast<uint8_t>(blendState.destBlendRGB);
+        blendAttachmentState.dstColorBlendFactor = PackGLBlendFactor(blendState.destBlendRGB);
-        blendAttachmentState.srcAlphaBlendFactor =
+        blendAttachmentState.srcAlphaBlendFactor = PackGLBlendFactor(blendState.sourceBlendAlpha);
-            static_cast<uint8_t>(blendState.sourceBlendAlpha);
+        blendAttachmentState.dstAlphaBlendFactor = PackGLBlendFactor(blendState.destBlendAlpha);
-        blendAttachmentState.dstAlphaBlendFactor = static_cast<uint8_t>(blendState.destBlendAlpha);
    }
 }