Fix implicit conversion to bool

Change-Id: Ia3fe8da45a24c446a689698018032efe09a19529

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
index 5e6e7c1..e16f529 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
@@ -887,7 +887,7 @@ bool SampleVerifier::verifySampleImpl (const SampleArguments&       args,
 
                for (int faceNdx = 0; faceNdx < 6; ++faceNdx)
                {
-                       const bool isPossible = faceBitmap & (1U << faceNdx);
+                       const bool isPossible = ((faceBitmap & (1U << faceNdx)) != 0);
 
                    if (!isPossible)
                        {

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp
index 9496f2d..31e33a3 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp
@@ -551,7 +551,7 @@ void wrapCubemapCorner (const IVec2&        coord,
        {
                const int faceEdge = adjacentEdges[faceNdx][cornerEdges[edgeNdx]];
 
-               bool isFlipped = (adjacentEdgeDirs[faceNdx][cornerEdges[edgeNdx]]);
+               bool isFlipped = (adjacentEdgeDirs[faceNdx][cornerEdges[edgeNdx]] == -1);
 
                if ((cornerEdges[edgeNdx] > 1) != (faceEdge > 1))
                {