Remove incorrect vertexPipelineStoresAndAtomics dependencies
Components: Vulkan
Affects: dEQP-VK.pipeline.push_descriptor.graphics.*
dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.*
dEQP-VK.glsl.opaque_type_indexing.ssbo.*
dEQP-VK.glsl.opaque_type_indexing.ssbo_storage_buffer_decoration.*
Change-Id: I68a6a42aac647e61b6d58f2cdc74b0a5b9ea9718
diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushDescriptorTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushDescriptorTests.cpp
index e9af52c..483e5a9 100644
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushDescriptorTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushDescriptorTests.cpp
@@ -636,7 +636,7 @@
void PushDescriptorBufferGraphicsTest::initPrograms (SourceCollections& sourceCollections) const
{
- const string bufferType = m_params.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER ? "uniform" : "buffer";
+ const string bufferType = m_params.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER ? "uniform" : "readonly buffer";
const string vertexSrc =
"#version 450\n"
"layout(location = 0) in highp vec4 position;\n"
diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
index d1f54ff..d0f7c9c 100644
--- a/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
@@ -1422,7 +1422,7 @@
const char* instanceName = "block";
const char* indicesPrefix = "index";
const char* resultPrefix = "result";
- const char* interfaceName = m_blockType == BLOCKTYPE_UNIFORM ? "uniform" : "buffer";
+ const char* interfaceName = m_blockType == BLOCKTYPE_UNIFORM ? "uniform" : "readonly buffer";
std::ostringstream global, code;
for (int readNdx = 0; readNdx < numReads; readNdx++)
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp
index f17fe94..d46ca8a 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp
@@ -1671,6 +1671,8 @@
"OpDecorate %in_b DescriptorSet 0 \n"
"OpDecorate %in_a Binding 0 \n"
"OpDecorate %in_b Binding 1 \n"
+ "OpDecorate %in_a NonWritable \n"
+ "OpDecorate %in_b NonWritable \n"
);
const StringTemplate preMain (
@@ -2072,6 +2074,7 @@
"OpDecorate %input DescriptorSet 0 \n"
"OpDecorate %input Binding 0 \n"
+ "OpDecorate %input NonWritable \n"
);
const StringTemplate preMain (
@@ -2444,6 +2447,7 @@
// Decorations
"OpDecorate %input DescriptorSet 0 \n"
"OpDecorate %input Binding 0 \n"
+ "OpDecorate %input NonWritable \n"
// Set the Block decoration
"OpDecorate %float_struct Block \n"
