From 5d433d4719250303b19853cab82ae99728ece676 Mon Sep 17 00:00:00 2001 From: Collin Baker Date: Wed, 10 Aug 2016 13:31:57 -0700 Subject: [PATCH] Fix implicit conversion to bool Change-Id: Ia3fe8da45a24c446a689698018032efe09a19529 --- .../vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp | 2 +- .../modules/vulkan/texture_filtering/vktSampleVerifierUtil.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp index 5e6e7c1..e16f529 100644 --- 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 --- 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)) { -- 2.7.4