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

Change-Id: Ie7d7c989b3c81202f9e9dd2454b6087aa7cc49e1

diff --combined external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
index be26400,af487c5..ea6d18e
--- 1/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
@@@ -1139,7 -1139,7 +1139,7 @@@ tcu::TestStatus recordLargePrimaryBuffe
  
                        // record resetting event
                        vk.cmdResetEvent(*primCmdBuf, *event,stageMask);
 -              };
 +              }
  
        }
        endCommandBuffer(vk, *primCmdBuf);
@@@ -1289,7 -1289,7 +1289,7 @@@ tcu::TestStatus recordLargeSecondaryBuf
  
                                // record resetting event
                                vk.cmdResetEvent(*primCmdBuf, *event,stageMask);
 -                      };
 +                      }
                }
  
                // end recording of secondary buffers
@@@ -2644,7 -2644,6 +2644,6 @@@ tcu::TestStatus recordBufferQueryImprec
                &secBufferInheritInfo,
        };
  
-       // Create an occlusion query with VK_QUERY_CONTROL_PRECISE_BIT set
        const VkQueryPoolCreateInfo                             queryPoolCreateInfo             =
        {
                VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO,                                       // sType
@@@ -2662,7 -2661,7 +2661,7 @@@
        VK_CHECK(vk.beginCommandBuffer(primCmdBuf.get(), &primBufferBeginInfo));
        {
                vk.cmdResetQueryPool(primCmdBuf.get(), queryPool.get(), 0u, 1u);
-               vk.cmdBeginQuery(primCmdBuf.get(), queryPool.get(), 0u, VK_QUERY_CONTROL_PRECISE_BIT);
+               vk.cmdBeginQuery(primCmdBuf.get(), queryPool.get(), 0u, 0u);
                {
                        vk.cmdExecuteCommands(primCmdBuf.get(), 1u, &secCmdBuf.get());
                }
@@@ -2670,7 -2669,7 +2669,7 @@@
        }
        endCommandBuffer(vk, primCmdBuf.get());
  
-       return tcu::TestStatus::pass("Successfully recorded a secondary command buffer allowing a precise occlusion query.");
+       return tcu::TestStatus::pass("Successfully recorded an imprecise query with a secondary command buffer allowing a precise occlusion query.");
  }
  
  tcu::TestStatus recordBufferQueryImpreciseWithoutFlagTest(Context& context)
@@@ -2740,7 -2739,6 +2739,6 @@@
                &secBufferInheritInfo,
        };
  
-       // Create an occlusion query with VK_QUERY_CONTROL_PRECISE_BIT set
        const VkQueryPoolCreateInfo                             queryPoolCreateInfo             =
        {
                VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO,                                       // sType
@@@ -2758,7 -2756,7 +2756,7 @@@
        VK_CHECK(vk.beginCommandBuffer(primCmdBuf.get(), &primBufferBeginInfo));
        {
                vk.cmdResetQueryPool(primCmdBuf.get(), queryPool.get(), 0u, 1u);
-               vk.cmdBeginQuery(primCmdBuf.get(), queryPool.get(), 0u, VK_QUERY_CONTROL_PRECISE_BIT);
+               vk.cmdBeginQuery(primCmdBuf.get(), queryPool.get(), 0u, 0u);
                {
                        vk.cmdExecuteCommands(primCmdBuf.get(), 1u, &secCmdBuf.get());
                }
@@@ -2766,7 -2764,7 +2764,7 @@@
        }
        endCommandBuffer(vk, primCmdBuf.get());
  
-       return tcu::TestStatus::pass("Successfully recorded a secondary command buffer allowing a precise occlusion query.");
+       return tcu::TestStatus::pass("Successfully recorded an imprecise query with a secondary command buffer not allowing a precise occlusion query.");
  }
  
  /******** 19.4. Command Buffer Submission (5.4 in VK 1.0 Spec) ****************/
@@@ -3175,7 -3173,7 +3173,7 @@@ tcu::TestStatus submitBufferWaitManySem
                // create semaphores for use in this test
                semaphoreArray[idx] = createSemaphore(vk, vkDevice);
                semaphores[idx] = semaphoreArray[idx].get();
 -      };
 +      }
  
        {
                // create submit info for buffer - signal semaphores
@@@ -3641,7 -3639,7 +3639,7 @@@ tcu::TestStatus executeSecondaryBufferT
                }
                // end recording of secondary buffers
                endCommandBuffer(vk, cmdBuffers[ndx]);
 -      };
 +      }
  
        // record primary command buffer one
        VK_CHECK(vk.beginCommandBuffer(*primCmdBufOne, &primCmdBufBeginInfo));

diff --combined external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
index 0270c29,3ab224b..4fce063
--- 1/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
--- 2/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
+++ b/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
@@@ -554,20 -554,23 +554,23 @@@ Move<VkDescriptorSetLayout>     CommonDescr
  
        bool optional = (m_testParams.additionalDescriptorBinding != BINDING_Undefined) && (m_testParams.additionalDescriptorType != VK_DESCRIPTOR_TYPE_UNDEFINED);
  
+       const VkShaderStageFlags bindingStageFlags = (m_testParams.descriptorType == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT) ?
+                                                                                                       VkShaderStageFlags{VK_SHADER_STAGE_FRAGMENT_BIT} : m_testParams.stageFlags;
+ 
        const VkDescriptorSetLayoutBinding      bindings[] =
        {
                {
                        m_testParams.descriptorBinding,                         // binding
                        m_testParams.descriptorType,                            // descriptorType
                        descriptorCount,                                                        // descriptorCount
-                       m_testParams.stageFlags,                                        // stageFlags
+                       bindingStageFlags,                                                      // stageFlags
                        DE_NULL,                                                                        // pImmutableSamplers
                },
                {
                        m_testParams.additionalDescriptorBinding,       // binding
                        m_testParams.additionalDescriptorType,          // descriptorType
                        1,                                                                                      // descriptorCount
-                       m_testParams.stageFlags,                                        // stageFlags
+                       bindingStageFlags,                                                      // stageFlags
                        DE_NULL,                                                                        // pImmutableSamplers
                }
        };
@@@ -2217,6 -2220,7 +2220,6 @@@ std::string CommonDescriptorInstance::g
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
 -                                      break;
                        }
                        break;
                case VK_SHADER_STAGE_FRAGMENT_BIT:
@@@ -2653,6 -2657,7 +2656,6 @@@
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
 -                                      break;
                        }
                    break;
                case VK_SHADER_STAGE_COMPUTE_BIT:
@@@ -2732,10 -2737,12 +2735,10 @@@
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
 -                                      break;
                        }
                        break;
                default:
                        TCU_THROW(InternalError, "Unexpected stage");
 -                      break;
        }
  
        return s.str();
@@@ -3596,7 -3603,7 +3599,7 @@@ void SamplerInstance::createAndPopulate
                {
                        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);