Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master

Change-Id: Ie214ae458af3879e564fba6778ba1488e6032b98

diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 96746fc,d186e58..8cad6ff
--- 1/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@@ -2927,13 -2810,10 +2927,13 @@@ tcu::TestStatus deviceFeatures2 (Contex
                deMemset(&protectedMemoryFeatures[ndx],                         0xFF*ndx, sizeof(VkPhysicalDeviceProtectedMemoryFeatures));
                deMemset(&samplerYcbcrConversionFeatures[ndx],          0xFF*ndx, sizeof(VkPhysicalDeviceSamplerYcbcrConversionFeatures));
                deMemset(&variablePointerFeatures[ndx],                         0xFF*ndx, sizeof(VkPhysicalDeviceVariablePointerFeatures));
-               deMemset(&scalarBlockLayoutFeatures[ndx],               0xFF*ndx, sizeof(VkPhysicalDeviceScalarBlockLayoutFeaturesEXT));
+               deMemset(&scalarBlockLayoutFeatures[ndx],                       0xFF*ndx, sizeof(VkPhysicalDeviceScalarBlockLayoutFeaturesEXT));
  
                device8BitStorageFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR;
 -              device8BitStorageFeatures[ndx].pNext = &device16BitStorageFeatures[ndx];
 +              device8BitStorageFeatures[ndx].pNext = &deviceConditionalRenderingFeatures[ndx];
 +
 +              deviceConditionalRenderingFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT;
 +              deviceConditionalRenderingFeatures[ndx].pNext = &device16BitStorageFeatures[ndx];
  
                device16BitStorageFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES;
                device16BitStorageFeatures[ndx].pNext = &deviceMultiviewFeatures[ndx];

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/vktTestCase.cpp
index ab36e86,9f53b27..0164bf3
--- 1/external/vulkancts/modules/vulkan/vktTestCase.cpp
--- 2/external/vulkancts/modules/vulkan/vktTestCase.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.cpp
@@@ -311,14 -311,12 +311,14 @@@ public
        VkPhysicalDevice8BitStorageFeaturesKHR                          eightBitStorageFeatures;
        VkPhysicalDevice16BitStorageFeatures                            sixteenBitStorageFeatures;
        VkPhysicalDeviceVariablePointerFeatures                         variablePointerFeatures;
-       VkPhysicalDeviceFloat16Int8FeaturesKHR                          float16Int8Features;
 +      VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT       vertexAttributeDivisorFeatures;
        VkPhysicalDeviceDescriptorIndexingFeaturesEXT           descriptorIndexingFeatures;
        VkPhysicalDeviceInlineUniformBlockFeaturesEXT           inlineUniformBlockFeatures;
        VkPhysicalDeviceVulkanMemoryModelFeaturesKHR            vulkanMemoryModelFeatures;
        VkPhysicalDeviceShaderAtomicInt64FeaturesKHR            shaderAtomicInt64Features;
 +      VkPhysicalDeviceConditionalRenderingFeaturesEXT         conditionalRenderingFeatures;
        VkPhysicalDeviceScalarBlockLayoutFeaturesEXT            scalarBlockLayoutFeatures;
+       VkPhysicalDeviceFloat16Int8FeaturesKHR                          float16Int8Features;
  
        DeviceFeatures (const InstanceInterface&        vki,
                                        const deUint32                          apiVersion,
@@@ -333,14 -331,10 +333,15 @@@
                deMemset(&variablePointerFeatures, 0, sizeof(variablePointerFeatures));
                deMemset(&descriptorIndexingFeatures, 0, sizeof(descriptorIndexingFeatures));
                deMemset(&inlineUniformBlockFeatures, 0, sizeof(inlineUniformBlockFeatures));
 +              deMemset(&float16Int8Features, 0, sizeof(float16Int8Features));
 +              deMemset(&vertexAttributeDivisorFeatures, 0, sizeof(vertexAttributeDivisorFeatures));
 +              deMemset(&descriptorIndexingFeatures, 0, sizeof(descriptorIndexingFeatures));
 +              deMemset(&inlineUniformBlockFeatures, 0, sizeof(inlineUniformBlockFeatures));
                deMemset(&vulkanMemoryModelFeatures, 0, sizeof(vulkanMemoryModelFeatures));
                deMemset(&shaderAtomicInt64Features, 0, sizeof(shaderAtomicInt64Features));
 +              deMemset(&conditionalRenderingFeatures, 0, sizeof(conditionalRenderingFeatures));
                deMemset(&scalarBlockLayoutFeatures, 0, sizeof(scalarBlockLayoutFeatures));
+               deMemset(&float16Int8Features, 0, sizeof(float16Int8Features));
  
                coreFeatures.sType                                              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
                samplerYCbCrConversionFeatures.sType    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES;
@@@ -349,14 -343,10 +350,15 @@@
                variablePointerFeatures.sType                   = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR;
                descriptorIndexingFeatures.sType                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT;
                inlineUniformBlockFeatures.sType                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT;
 +              float16Int8Features.sType                               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR;
 +              vertexAttributeDivisorFeatures.sType    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT;
 +              descriptorIndexingFeatures.sType                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT;
 +              inlineUniformBlockFeatures.sType                = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT;
                vulkanMemoryModelFeatures.sType                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR;
                shaderAtomicInt64Features.sType                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR;
 +              conditionalRenderingFeatures.sType              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT;
                scalarBlockLayoutFeatures.sType                 = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT;
+               float16Int8Features.sType                               = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR;
  
  
                if (isPhysicalDeviceFeatures2Supported(apiVersion, instanceExtensions))
@@@ -455,12 -435,10 +462,12 @@@ public
        const VkPhysicalDevice8BitStorageFeaturesKHR&                   get8BitStorageFeatures                          (void) const    { return m_deviceFeatures.eightBitStorageFeatures;                      }
        const VkPhysicalDevice16BitStorageFeatures&                             get16BitStorageFeatures                         (void) const    { return m_deviceFeatures.sixteenBitStorageFeatures;            }
        const VkPhysicalDeviceVariablePointerFeatures&                  getVariablePointerFeatures                      (void) const    { return m_deviceFeatures.variablePointerFeatures;                      }
-       const VkPhysicalDeviceFloat16Int8FeaturesKHR&                   getFloat16Int8Features                          (void) const    { return m_deviceFeatures.float16Int8Features;                          }
 +      const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT&getVertexAttributeDivisorFeatures       (void) const    { return m_deviceFeatures.vertexAttributeDivisorFeatures;       }
        const VkPhysicalDeviceVulkanMemoryModelFeaturesKHR&             getVulkanMemoryModelFeatures            (void) const    { return m_deviceFeatures.vulkanMemoryModelFeatures;    }
        const VkPhysicalDeviceShaderAtomicInt64FeaturesKHR&             getShaderAtomicInt64Features            (void) const    { return m_deviceFeatures.shaderAtomicInt64Features;    }
 +      const VkPhysicalDeviceConditionalRenderingFeaturesEXT&  getConditionalRenderingFeatures         (void) const    { return m_deviceFeatures.conditionalRenderingFeatures; }
        const VkPhysicalDeviceScalarBlockLayoutFeaturesEXT&             getScalarBlockLayoutFeatures            (void) const    { return m_deviceFeatures.scalarBlockLayoutFeatures;    }
+       const VkPhysicalDeviceFloat16Int8FeaturesKHR&                   getFloat16Int8Features                          (void) const    { return m_deviceFeatures.float16Int8Features;                          }
        VkDevice                                                                                                getDevice                                                       (void) const    { return *m_device;                                                                                     }
        const DeviceInterface&                                                                  getDeviceInterface                                      (void) const    { return m_deviceInterface;                                                                     }
        const VkPhysicalDeviceProperties&                                               getDeviceProperties                                     (void) const    { return m_deviceProperties;                                                            }
@@@ -592,18 -570,14 +599,18 @@@ const vk::VkPhysicalDevice16BitStorageF
                                                                                Context::get16BitStorageFeatures                (void) const { return m_device->get16BitStorageFeatures();              }
  const vk::VkPhysicalDeviceVariablePointerFeatures&
                                                                                Context::getVariablePointerFeatures             (void) const { return m_device->getVariablePointerFeatures();   }
- const vk::VkPhysicalDeviceFloat16Int8FeaturesKHR&
-                                                                               Context::getFloat16Int8Features                 (void) const { return m_device->getFloat16Int8Features();               }
 +const vk::VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT&
 +                                                                              Context::getVertexAttributeDivisorFeatures      (void) const { return m_device->getVertexAttributeDivisorFeatures();    }
  const vk::VkPhysicalDeviceVulkanMemoryModelFeaturesKHR&
                                                                                Context::getVulkanMemoryModelFeatures   (void) const { return m_device->getVulkanMemoryModelFeatures(); }
  const vk::VkPhysicalDeviceShaderAtomicInt64FeaturesKHR&
                                                                                Context::getShaderAtomicInt64Features   (void) const { return m_device->getShaderAtomicInt64Features(); }
 +const vk::VkPhysicalDeviceConditionalRenderingFeaturesEXT&
 +                                                                              Context::getConditionalRenderingFeatures(void) const { return m_device->getConditionalRenderingFeatures();      }
  const vk::VkPhysicalDeviceScalarBlockLayoutFeaturesEXT&
                                                                                Context::getScalarBlockLayoutFeatures   (void) const { return m_device->getScalarBlockLayoutFeatures(); }
+ const vk::VkPhysicalDeviceFloat16Int8FeaturesKHR&
+                                                                               Context::getFloat16Int8Features                 (void) const { return m_device->getFloat16Int8Features();               }
  const vk::VkPhysicalDeviceProperties& Context::getDeviceProperties                    (void) const { return m_device->getDeviceProperties();                  }
  const vector<string>&                                 Context::getDeviceExtensions                    (void) const { return m_device->getDeviceExtensions();                  }
  vk::VkDevice                                                  Context::getDevice                                              (void) const { return m_device->getDevice();                                    }

diff --cc external/vulkancts/modules/vulkan/vktTestCase.hpp
index 242a371,ec90e5a..8d14246
--- 1/external/vulkancts/modules/vulkan/vktTestCase.hpp
--- 2/external/vulkancts/modules/vulkan/vktTestCase.hpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.hpp
@@@ -78,18 -78,14 +78,18 @@@ public
                                                                                                get16BitStorageFeatures                 (void) const;
        const vk::VkPhysicalDeviceVariablePointerFeatures&
                                                                                                getVariablePointerFeatures              (void) const;
-       const vk::VkPhysicalDeviceFloat16Int8FeaturesKHR&
-                                                                                               getFloat16Int8Features                  (void) const;
 +      const vk::VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT&
 +                                                                                              getVertexAttributeDivisorFeatures(void) const;
        const vk::VkPhysicalDeviceVulkanMemoryModelFeaturesKHR&
                                                                                                getVulkanMemoryModelFeatures    (void) const;
        const vk::VkPhysicalDeviceShaderAtomicInt64FeaturesKHR&
                                                                                                getShaderAtomicInt64Features    (void) const;
 +      const vk::VkPhysicalDeviceConditionalRenderingFeaturesEXT&
 +                                                                                              getConditionalRenderingFeatures (void) const;
        const vk::VkPhysicalDeviceScalarBlockLayoutFeaturesEXT&
                                                                                                getScalarBlockLayoutFeatures    (void) const;
+       const vk::VkPhysicalDeviceFloat16Int8FeaturesKHR&
+                                                                                               getFloat16Int8Features                  (void) const;
        const vk::VkPhysicalDeviceProperties&           getDeviceProperties                             (void) const;
        const std::vector<std::string>&                         getDeviceExtensions                             (void) const;
        vk::VkDevice                                                            getDevice                                               (void) const;