tests: Add test for consuming COMBINED_IMAGE_SAMPLER as sampler
This is explicitly allowed per 13.1.4:
"VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER descriptor set entries can
also be accessed via separate sampler and sampled image shader
variables. Such variables refer exclusively to the corresponding half of
the descriptor ..."
Signed-off-by: Chris Forbes <chrisforbes@google.com>
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 1f7aaaf..1af47d5 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -13632,6 +13632,79 @@
vkDestroyDescriptorSetLayout(m_device->device(), dsl, nullptr);
}
+TEST_F(VkLayerTest, CreateComputePipelineCombinedImageSamplerConsumedAsSampler) {
+ m_errorMonitor->ExpectSuccess();
+
+ ASSERT_NO_FATAL_FAILURE(InitState());
+
+ VkDescriptorSetLayoutBinding bindings[] = {
+ {
+ 0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+ 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr
+ },
+ {
+ 1, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
+ 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr
+ },
+ {
+ 2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+ 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr
+ },
+ };
+ VkDescriptorSetLayoutCreateInfo dslci = {
+ VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, nullptr,
+ 0, 3, bindings
+ };
+ VkDescriptorSetLayout dsl;
+ VkResult err = vkCreateDescriptorSetLayout(m_device->device(), &dslci,
+ nullptr, &dsl);
+ ASSERT_VK_SUCCESS(err);
+
+ VkPipelineLayoutCreateInfo plci = {
+ VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, nullptr,
+ 0, 1, &dsl, 0, nullptr
+ };
+ VkPipelineLayout pl;
+ err = vkCreatePipelineLayout(m_device->device(), &plci,
+ nullptr, &pl);
+ ASSERT_VK_SUCCESS(err);
+
+ char const *csSource =
+ "#version 450\n"
+ "\n"
+ "layout(local_size_x=1) in;\n"
+ "layout(set=0, binding=0) uniform sampler s;\n"
+ "layout(set=0, binding=1) uniform texture2D t;\n"
+ "layout(set=0, binding=2) buffer block { vec4 x; };\n"
+ "void main() {\n"
+ " x = texture(sampler2D(t, s), vec2(0));\n"
+ "}\n";
+ VkShaderObj cs(m_device, csSource, VK_SHADER_STAGE_COMPUTE_BIT, this);
+
+ VkComputePipelineCreateInfo cpci = {
+ VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO, nullptr,
+ 0, {
+ VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
+ nullptr, 0, VK_SHADER_STAGE_COMPUTE_BIT,
+ cs.handle(), "main", nullptr
+ },
+ pl, VK_NULL_HANDLE, -1
+ };
+
+ VkPipeline pipe;
+ err = vkCreateComputePipelines(
+ m_device->device(), VK_NULL_HANDLE, 1, &cpci, nullptr, &pipe);
+
+ m_errorMonitor->VerifyNotFound();
+
+ if (err == VK_SUCCESS) {
+ vkDestroyPipeline(m_device->device(), pipe, nullptr);
+ }
+
+ vkDestroyPipelineLayout(m_device->device(), pl, nullptr);
+ vkDestroyDescriptorSetLayout(m_device->device(), dsl, nullptr);
+}
+
#endif // SHADER_CHECKER_TESTS
#if DEVICE_LIMITS_TESTS