OSDN Git Service

Fix mismatch of enum types in equality test
authorBen Clayton <headlessclayton@gmail.com>
Tue, 19 Feb 2019 17:04:37 +0000 (17:04 +0000)
committerBen Clayton <bclayton@google.com>
Wed, 20 Feb 2019 07:55:35 +0000 (07:55 +0000)
Lost in the noise of other warnings

Bug: b/123933266
Change-Id: I4c4eecb55a364c9afacf52b790f43f9d5c9640cb
Reviewed-on: https://swiftshader-review.googlesource.com/c/25012
Tested-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Device/Context.cpp

index 6f12455..53bcaff 100644 (file)
@@ -513,7 +513,7 @@ namespace sw
                        }
                        else
                        {
-                               if(destBlendFactor() == VK_BLEND_OP_ZERO_EXT)
+                               if(destBlendFactor() == VK_BLEND_FACTOR_ZERO)
                                {
                                        return VK_BLEND_OP_ZERO_EXT;   // Negative, clamped to zero
                                }
@@ -681,7 +681,7 @@ namespace sw
                                }
                                else
                                {
-                                       if(destBlendFactorAlpha() == VK_BLEND_OP_ZERO_EXT)
+                                       if(destBlendFactorAlpha() == VK_BLEND_FACTOR_ZERO)
                                        {
                                                return VK_BLEND_OP_ZERO_EXT;   // Negative, clamped to zero
                                        }