From e3197a73a0dede549952bce428b2c904084f7a4c Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Fri, 17 Apr 2020 03:53:47 +0100 Subject: [PATCH] Replace LAST with MAX_ENUM in mapBorderColor Fixes compilation errors with the newer headers. Affected tests: dEQP-VK.pipeline.sampler.*border* Components: Vulkan VK-GL-CTS issue: 2332 Change-Id: I757017612045666de53b8a09691eed27587503df --- external/vulkancts/framework/vulkan/vkImageUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.cpp b/external/vulkancts/framework/vulkan/vkImageUtil.cpp index ad3b767..61d22d5 100644 --- a/external/vulkancts/framework/vulkan/vkImageUtil.cpp +++ b/external/vulkancts/framework/vulkan/vkImageUtil.cpp @@ -3492,7 +3492,7 @@ static VkBorderColor mapBorderColor (tcu::TextureChannelClass channelClass, cons } DE_FATAL("Unsupported border color"); - return VK_BORDER_COLOR_LAST; + return VK_BORDER_COLOR_MAX_ENUM; } VkSamplerCreateInfo mapSampler (const tcu::Sampler& sampler, const tcu::TextureFormat& format, float minLod, float maxLod, bool unnormal) -- 2.7.4