Fixes texture filter cubic mipmap tests

Tests using wrong miplevel to verify

Components: Vulkan
VK-GL-CTS Issue: 2662

Affects:
dEQP-VK.texture.filtering.*.cubic

Change-Id: I65ca120bdcaf460ce4addf15bc5ed15bbc3bc7b4

diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.cpp b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
index f7f38d3..9ef5ce5 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkImageUtil.cpp
+++ b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
@@ -3503,10 +3503,10 @@ static VkBorderColor mapBorderColor (tcu::TextureChannelClass channelClass, cons
 
 VkSamplerCreateInfo mapSampler (const tcu::Sampler& sampler, const tcu::TextureFormat& format, float minLod, float maxLod, bool unnormal)
 {
-       const bool                                      compareEnabled  = (sampler.compare != tcu::Sampler::COMPAREMODE_NONE);
-       const VkCompareOp                       compareOp               = (compareEnabled) ? (mapCompareMode(sampler.compare)) : (VK_COMPARE_OP_ALWAYS);
-       const VkBorderColor                     borderColor             = mapBorderColor(getTextureChannelClass(format.type), sampler.borderColor);
-       const bool                                      isMipmapEnabled = (sampler.minFilter != tcu::Sampler::NEAREST && sampler.minFilter != tcu::Sampler::LINEAR);
+       const bool                      compareEnabled  = (sampler.compare != tcu::Sampler::COMPAREMODE_NONE);
+       const VkCompareOp       compareOp               = (compareEnabled) ? (mapCompareMode(sampler.compare)) : (VK_COMPARE_OP_ALWAYS);
+       const VkBorderColor     borderColor             = mapBorderColor(getTextureChannelClass(format.type), sampler.borderColor);
+       const bool                      isMipmapEnabled = (sampler.minFilter != tcu::Sampler::NEAREST && sampler.minFilter != tcu::Sampler::LINEAR && sampler.minFilter != tcu::Sampler::CUBIC);
 
        const VkSamplerCreateInfo       createInfo              =
        {