Fix asserts in image.mutable tests

Fix malformed asserts and missing case switches in this test.

Components: Vulkan

Affects: dEQP-VK.image.mutable

VK-GL-CTS Issue: 1294

(cherry picked from commit 29c222eaa9cc5aeac37886b3cc25330ddc31689b)

Change-Id: I1a49f615e843c33d5483cd7bba4773370377dde7

diff --git a/external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
index e2c5a8b..7b3eacc 100644 (file)
--- a/external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
+++ b/external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
@@ -1020,7 +1020,7 @@ void UploadDownloadExecutor::runSwapchain(Context& context, VkBuffer buffer, VkI
                uploadCopy(context);
                break;
        default:
-               DE_ASSERT("Unsupported upload method");
+               DE_FATAL("Unsupported upload method");
        }
 
        switch (m_caseDef.download)
@@ -1035,7 +1035,7 @@ void UploadDownloadExecutor::runSwapchain(Context& context, VkBuffer buffer, VkI
                downloadTexture(context, buffer);
                break;
        default:
-               DE_ASSERT("Unsupported download method");
+               DE_FATAL("Unsupported download method");
        }
 
        endCommandBuffer(m_vk, *m_cmdBuffer);
@@ -2098,7 +2098,7 @@ tcu::TestStatus testSwapchainMutable(Context& context, CaseDef caseDef)
                viewFormatFeatureFlags |= VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT;
                break;
        default:
-               DE_ASSERT("Invalid upload method");
+               DE_FATAL("Invalid upload method");
                break;
        }
        switch (caseDef.download)
@@ -2113,7 +2113,7 @@ tcu::TestStatus testSwapchainMutable(Context& context, CaseDef caseDef)
                viewFormatFeatureFlags |= VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT;
                break;
        default:
-               DE_ASSERT("Invalid download method");
+               DE_FATAL("Invalid download method");
                break;
        }