projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 006fe19)
Fix dEQP-VK.binding_model discontiguous descriptors tests
authorPyry Haulos <phaulos@google.com>
Mon, 11 Apr 2016 17:15:34 +0000 (10:15 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 11 Apr 2016 17:38:53 +0000 (10:38 -0700)
 * Descriptor set update wrote descriptors in incorrect order.

 * Removed compute cases where MULTIPLE_DISCONTIGUOUS_DESCRIPTORS didn't
have any effect.

 * Removed a few cases where code was needlessly handling
MULTIPLE_DISCONTIGUOUS_DESCRIPTORS causing confusion.

Bug: 28075783

Change-Id: I86ef93d41f5d493fac757ba44088d947b88bc702

android/cts/master/com.drawelements.deqp.vk.xml patch | blob | history
android/cts/master/vk-master.txt patch | blob | history
external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp patch | blob | history

diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index 9c4e1d4..a25ec17 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -183098,68 +183098,6 @@
                                                                        <TestInstance/>
                                                                </Test>
                                                        </TestCase>
-                                                       <TestCase name="multiple_discontiguous_descriptors">
-                                                               <Test name="1d">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_array">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_array_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_array_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_array">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_array_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_array_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="3d">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="3d_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_array">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_array_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_array_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                       </TestCase>
                                                        <TestCase name="descriptor_array">
                                                                <Test name="1d">
                                                                        <TestInstance/>
@@ -185100,68 +185038,6 @@
                                                                        <TestInstance/>
                                                                </Test>
                                                        </TestCase>
-                                                       <TestCase name="multiple_discontiguous_descriptors">
-                                                               <Test name="1d">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_array">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_array_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="1d_array_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_array">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_array_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="2d_array_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="3d">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="3d_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_array">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_array_base_mip">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                               <Test name="cube_array_base_slice">
-                                                                       <TestInstance/>
-                                                               </Test>
-                                                       </TestCase>
                                                        <TestCase name="descriptor_array">
                                                                <Test name="1d">
                                                                        <TestInstance/>
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 94fd6a8..a7e07c3 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -56202,26 +56202,6 @@ dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.mult
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_contiguous_descriptors.cube_array
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_contiguous_descriptors.cube_array_base_mip
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_contiguous_descriptors.cube_array_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.1d
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.1d_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.1d_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.1d_array
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.1d_array_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.1d_array_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.2d
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.2d_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.2d_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.2d_array
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.2d_array_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.2d_array_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.3d
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.3d_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.cube
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.cube_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.cube_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.cube_array
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.cube_array_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.multiple_discontiguous_descriptors.cube_array_base_slice
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.descriptor_array.1d
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.descriptor_array.1d_base_mip
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_mutable.compute.descriptor_array.1d_base_slice
@@ -56842,26 +56822,6 @@ dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.mu
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_contiguous_descriptors.cube_array
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_contiguous_descriptors.cube_array_base_mip
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_contiguous_descriptors.cube_array_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.1d
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.1d_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.1d_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.1d_array
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.1d_array_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.1d_array_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.2d
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.2d_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.2d_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.2d_array
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.2d_array_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.2d_array_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.3d
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.3d_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.cube
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.cube_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.cube_base_slice
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.cube_array
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.cube_array_base_mip
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.multiple_discontiguous_descriptors.cube_array_base_slice
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.descriptor_array.1d
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.descriptor_array.1d_base_mip
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.sampler_immutable.compute.descriptor_array.1d_base_slice
diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
index 894773c..b7773a0 100644 (file)
--- a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
@@ -3390,7 +3390,6 @@ vk::Move<vk::VkDescriptorSetLayout> ImageFetchRenderInstance::createDescriptorSe
                        break;
 
                case SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS:
-               case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
                        builder.addSingleBinding(descriptorType, stageFlags);
                        builder.addSingleBinding(descriptorType, stageFlags);
                        break;
@@ -3467,7 +3466,6 @@ vk::Move<vk::VkDescriptorSet> ImageFetchRenderInstance::createDescriptorSet (con
                        break;
 
                case SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS:
-               case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
                        builder.writeSingle(*descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(0u), descriptorType, &imageInfos[0]);
                        builder.writeSingle(*descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(1u), descriptorType, &imageInfos[1]);
                        break;
@@ -3492,7 +3490,6 @@ void ImageFetchRenderInstance::logTestPlan (void) const
                << "Single descriptor set. Descriptor set contains "
                        << ((m_shaderInterface == SHADER_INPUT_SINGLE_DESCRIPTOR) ? "single" :
                            (m_shaderInterface == SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS) ? "two" :
-                               (m_shaderInterface == SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS) ? "two" :
                            (m_shaderInterface == SHADER_INPUT_DESCRIPTOR_ARRAY) ? "an array (size 2) of" :
                            (const char*)DE_NULL)
                << " descriptor(s) of type " << vk::getDescriptorTypeName(m_descriptorType) << "\n"
@@ -3639,7 +3636,6 @@ vk::Move<vk::VkDescriptorSetLayout> ImageFetchComputeInstance::createDescriptorS
                        break;
 
                case SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS:
-               case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
                        builder.addSingleBinding(m_descriptorType, vk::VK_SHADER_STAGE_COMPUTE_BIT);
                        builder.addSingleBinding(m_descriptorType, vk::VK_SHADER_STAGE_COMPUTE_BIT);
                        break;
@@ -3695,7 +3691,6 @@ vk::Move<vk::VkDescriptorSet> ImageFetchComputeInstance::createDescriptorSet (vk
                        break;
 
                case SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS:
-               case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
                        builder.writeSingle(*descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(1u), m_descriptorType, &imageInfos[0]);
                        builder.writeSingle(*descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(2u), m_descriptorType, &imageInfos[1]);
                        break;
@@ -3726,7 +3721,6 @@ void ImageFetchComputeInstance::logTestPlan (void) const
                << "Single descriptor set. Descriptor set contains "
                        << ((m_shaderInterface == SHADER_INPUT_SINGLE_DESCRIPTOR) ? "single" :
                            (m_shaderInterface == SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS) ? "two" :
-                               (m_shaderInterface == SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS) ? "two" :
                            (m_shaderInterface == SHADER_INPUT_DESCRIPTOR_ARRAY) ? "an array (size 2) of" :
                            (const char*)DE_NULL)
                << " descriptor(s) of type " << vk::getDescriptorTypeName(m_descriptorType) << "\n"
@@ -4276,33 +4270,34 @@ vk::Move<vk::VkDescriptorSetLayout> ImageSampleRenderInstance::createDescriptorS
        };
 
        vk::DescriptorSetLayoutBuilder  builder;
-
-       if (shaderInterface != SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS)
-       {
-               // with samplers, separate texture at binding 0
-               if (descriptorType == vk::VK_DESCRIPTOR_TYPE_SAMPLER)
-                       builder.addSingleBinding(vk::VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, stageFlags);
-       }
+       const bool                                              addSeparateImage        = descriptorType == vk::VK_DESCRIPTOR_TYPE_SAMPLER;
 
        // (combined)samplers follow
        switch (shaderInterface)
        {
                case SHADER_INPUT_SINGLE_DESCRIPTOR:
+                       if (addSeparateImage)
+                               builder.addSingleBinding(vk::VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, stageFlags);
                        builder.addSingleSamplerBinding(descriptorType, stageFlags, (images.isImmutable()) ? (&samplers[0]) : (DE_NULL));
                        break;
 
                case SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS:
+                       if (addSeparateImage)
+                               builder.addSingleBinding(vk::VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, stageFlags);
+                       builder.addSingleSamplerBinding(descriptorType, stageFlags, (images.isImmutable()) ? (&samplers[0]) : (DE_NULL));
+                       builder.addSingleSamplerBinding(descriptorType, stageFlags, (images.isImmutable()) ? (&samplers[1]) : (DE_NULL));
+                       break;
+
                case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
                        builder.addSingleSamplerBinding(descriptorType, stageFlags, (images.isImmutable()) ? (&samplers[0]) : (DE_NULL));
-                       if (shaderInterface == SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS)
-                       {
-                               if (descriptorType == vk::VK_DESCRIPTOR_TYPE_SAMPLER)
-                                       builder.addSingleBinding(vk::VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, stageFlags);
-                       }
+                       if (addSeparateImage)
+                               builder.addSingleBinding(vk::VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, stageFlags);
                        builder.addSingleSamplerBinding(descriptorType, stageFlags, (images.isImmutable()) ? (&samplers[1]) : (DE_NULL));
                        break;
 
                case SHADER_INPUT_DESCRIPTOR_ARRAY:
+                       if (addSeparateImage)
+                               builder.addSingleBinding(vk::VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, stageFlags);
                        builder.addArraySamplerBinding(descriptorType, 2u, stageFlags, (images.isImmutable()) ? (samplers) : (DE_NULL));
                        break;
 
@@ -4401,9 +4396,10 @@ void ImageSampleRenderInstance::writeSamplerDescriptorSet (const vk::DeviceInter
        };
 
        vk::DescriptorSetUpdateBuilder          builder;
+       const deUint32                                          samplerLocation         = shaderInterface == SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS ? 1u : 0u;
 
        // stand alone texture
-       builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(0u), vk::VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, &imageInfo);
+       builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(samplerLocation), vk::VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, &imageInfo);
 
        // samplers
        if (!isImmutable)
@@ -4468,11 +4464,6 @@ void ImageSampleRenderInstance::writeImageSamplerDescriptorSet (const vk::Device
                        builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(1u), vk::VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, &imageSamplers[1]);
                        break;
 
-               case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
-                       builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(0u), vk::VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, &imageSamplers[0]);
-                       builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(1u), vk::VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, &imageSamplers[1]);
-                       break;
-
                case SHADER_INPUT_DESCRIPTOR_ARRAY:
                        builder.writeArray(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(0u), vk::VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2u, imageSamplers);
                        break;
@@ -4685,7 +4676,6 @@ vk::Move<vk::VkDescriptorSetLayout> ImageSampleComputeInstance::createDescriptor
                        break;
 
                case SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS:
-               case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
                        builder.addSingleSamplerBinding(m_descriptorType, vk::VK_SHADER_STAGE_COMPUTE_BIT, (m_images.isImmutable()) ? (&samplers[0]) : (DE_NULL));
                        builder.addSingleSamplerBinding(m_descriptorType, vk::VK_SHADER_STAGE_COMPUTE_BIT, (m_images.isImmutable()) ? (&samplers[1]) : (DE_NULL));
                        break;
@@ -4765,7 +4755,6 @@ void ImageSampleComputeInstance::writeSamplerDescriptorSet (vk::VkDescriptorSet
                                break;
 
                        case SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS:
-                       case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
                                builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(2u), vk::VK_DESCRIPTOR_TYPE_SAMPLER, &samplersInfos[0]);
                                builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(3u), vk::VK_DESCRIPTOR_TYPE_SAMPLER, &samplersInfos[1]);
                                break;
@@ -4809,7 +4798,6 @@ void ImageSampleComputeInstance::writeImageSamplerDescriptorSet (vk::VkDescripto
                        break;
 
                case SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS:
-               case SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS:
                        builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(1u), vk::VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, &imageSamplers[0]);
                        builder.writeSingle(descriptorSet, vk::DescriptorSetUpdateBuilder::Location::binding(2u), vk::VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, &imageSamplers[1]);
                        break;
@@ -4842,7 +4830,6 @@ void ImageSampleComputeInstance::logTestPlan (void) const
                msg << "Single descriptor set. Descriptor set contains "
                        << ((m_shaderInterface == SHADER_INPUT_SINGLE_DESCRIPTOR) ? "single" :
                            (m_shaderInterface == SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS) ? "two" :
-                           (m_shaderInterface == SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS) ? "two" :
                            (m_shaderInterface == SHADER_INPUT_DESCRIPTOR_ARRAY) ? "an array (size 2) of" :
                            (const char*)DE_NULL)
                        << " VK_DESCRIPTOR_TYPE_SAMPLER descriptor(s) and a single texture.\n";
@@ -4852,7 +4839,6 @@ void ImageSampleComputeInstance::logTestPlan (void) const
                msg << "Single descriptor set. Descriptor set contains "
                        << ((m_shaderInterface == SHADER_INPUT_SINGLE_DESCRIPTOR) ? "single" :
                            (m_shaderInterface == SHADER_INPUT_MULTIPLE_CONTIGUOUS_DESCRIPTORS) ? "two" :
-                           (m_shaderInterface == SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS) ? "two" :
                            (m_shaderInterface == SHADER_INPUT_DESCRIPTOR_ARRAY) ? "an array (size 2) of" :
                            (const char*)DE_NULL)
                        << " VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER descriptor(s).\n";
@@ -6234,8 +6220,9 @@ void createShaderAccessImageTests (tcu::TestCaseGroup*            group,
                // never overlap
                DE_ASSERT((s_imageTypes[ndx].flags & resourceFlags) == 0u);
 
-               // SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS only applies to VK_DESCRIPTOR_TYPE_SAMPLER
-               if (dimension==SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS && descriptorType != vk::VK_DESCRIPTOR_TYPE_SAMPLER)
+               // SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS only supported in VK_DESCRIPTOR_TYPE_SAMPLER on graphics shaders for now
+               if (dimension == SHADER_INPUT_MULTIPLE_DISCONTIGUOUS_DESCRIPTORS &&
+                       (descriptorType != vk::VK_DESCRIPTOR_TYPE_SAMPLER || activeStages == vk::VK_SHADER_STAGE_COMPUTE_BIT))
                        continue;
 
                group->addChild(new ImageDescriptorCase(group->getTestContext(),
Domain: Graphics System / GL;