I forgot to do this in commit 76b97d544e ("anv: enable storage image
extended formats"). Since both drivers support this now, no need for the
conditional enable.
Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
---
src/amd/vulkan/radv_pipeline.c | 1 -
src/compiler/spirv/nir_spirv.h | 1 -
src/compiler/spirv/spirv_to_nir.c | 4 +---
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 25d7805..75785ec 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -192,7 +192,6 @@ radv_shader_compile_to_nir(struct radv_device *device,
}
}
const struct nir_spirv_supported_extensions supported_ext = {
- .storage_image_extended_formats = true,
};
entry_point = spirv_to_nir(spirv, module->size / 4,
spec_entries, num_spec_entries,
diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index d959f3f..e0112ef 100644
--- a/src/compiler/spirv/nir_spirv.h
+++ b/src/compiler/spirv/nir_spirv.h
@@ -42,7 +42,6 @@ struct nir_spirv_specialization {
};
struct nir_spirv_supported_extensions {
- bool storage_image_extended_formats;
bool image_ms_array;
};
diff --git a/src/compiler/spirv/spirv_to_nir.c
b/src/compiler/spirv/spirv_to_nir.c
index b8acc1e..07980aa 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -2506,6 +2506,7 @@ vtn_handle_preamble_instruction(struct vtn_builder *b,
SpvOp opcode,
case SpvCapabilityCullDistance:
case SpvCapabilityInputAttachment:
case SpvCapabilityImageGatherExtended:
+ case SpvCapabilityStorageImageExtendedFormats:
break;
case SpvCapabilityGeometryStreams:
@@ -2546,9 +2547,6 @@ vtn_handle_preamble_instruction(struct vtn_builder *b,
SpvOp opcode,
spirv_capability_to_string(cap));
break;
- case SpvCapabilityStorageImageExtendedFormats:
- spv_check_supported(storage_image_extended_formats, cap);
- break;
case SpvCapabilityImageMSArray:
spv_check_supported(image_ms_array, cap);
break;
--
2.10.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
