summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2016-12-29 20:59:12 -0500
committerIlia Mirkin <[email protected]>2016-12-29 22:09:58 -0500
commit36c648b894cfdf6471221d57504f9ba99b83cd41 (patch)
tree741ad3693484caaaddeafc5a9ffa3a34af4c9039 /src/compiler
parentc633f228b482f21b7646728569f807bb452fddfb (diff)
spirv: always expose SpvCapabilityStorageImageExtendedFormats
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 <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/spirv/nir_spirv.h1
-rw-r--r--src/compiler/spirv/spirv_to_nir.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index d959f3f227c..e0112ef4ad4 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 b8acc1ed2e9..07980aa2019 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;