Merge vk-gl-cts/vulkan-cts-1.2.7 into vk-gl-cts/vulkan-cts-1.2.8

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / descriptor_indexing / vktDescriptorSetsIndexingTests.cpp

diff --git a/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp b/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
index 3ab224b..4fce063 100644 (file)
--- a/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
+++ b/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
@@ -2220,7 +2220,6 @@ std::string CommonDescriptorInstance::getShaderAsm                                        (VkShaderStageFlagBits
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
-                                       break;
                        }
                        break;
                case VK_SHADER_STAGE_FRAGMENT_BIT:
@@ -2657,7 +2656,6 @@ std::string CommonDescriptorInstance::getShaderAsm                                        (VkShaderStageFlagBits
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
-                                       break;
                        }
                    break;
                case VK_SHADER_STAGE_COMPUTE_BIT:
@@ -2737,12 +2735,10 @@ std::string CommonDescriptorInstance::getShaderAsm                                      (VkShaderStageFlagBits
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
-                                       break;
                        }
                        break;
                default:
                        TCU_THROW(InternalError, "Unexpected stage");
-                       break;
        }
 
        return s.str();
@@ -3603,7 +3599,7 @@ void SamplerInstance::createAndPopulateDescriptors                                        (IterateCommonVariables&
                {
                        imageExtent.width *= 2;
                        imageExtent.height *= 2;
-               };
+               }
 
                createImages(variables.descriptorsImages, variables.descriptorsBufferInfos, variables.descriptorsBuffer,
                        VK_BUFFER_USAGE_TRANSFER_SRC_BIT, imageExtent, m_colorFormat, VK_IMAGE_LAYOUT_UNDEFINED, 1, m_testParams.usesMipMaps);