OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spirv: always expose SpvCapabilityStorageImageExtendedFormats

Browse Source 
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 <imirkin@alum.mit.edu>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Ilia Mirkin
2016-12-29 20:59:12 -05:00
parent c633f228b4
commit 36c648b894
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/amd/vulkan/radv_pipeline.c
View File

@@ -192,7 +192,6 @@ radv_shader_compile_to_nir(struct radv_device *device,
} }
} }
const struct nir_spirv_supported_extensions supported_ext = { const struct nir_spirv_supported_extensions supported_ext = {
.storage_image_extended_formats = true,
}; };
entry_point = spirv_to_nir(spirv, module->size / 4, entry_point = spirv_to_nir(spirv, module->size / 4,
spec_entries, num_spec_entries, spec_entries, num_spec_entries,

1
src/compiler/spirv/nir_spirv.h
View File

@@ -42,7 +42,6 @@ struct nir_spirv_specialization {
}; };
struct nir_spirv_supported_extensions { struct nir_spirv_supported_extensions {
bool storage_image_extended_formats;
bool image_ms_array; bool image_ms_array;
}; };

4
src/compiler/spirv/spirv_to_nir.c
View File

@@ -2506,6 +2506,7 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvCapabilityCullDistance: case SpvCapabilityCullDistance:
case SpvCapabilityInputAttachment: case SpvCapabilityInputAttachment:
case SpvCapabilityImageGatherExtended: case SpvCapabilityImageGatherExtended:
case SpvCapabilityStorageImageExtendedFormats:
break; break;
case SpvCapabilityGeometryStreams: case SpvCapabilityGeometryStreams:
@@ -2546,9 +2547,6 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
spirv_capability_to_string(cap)); spirv_capability_to_string(cap));
break; break;
case SpvCapabilityStorageImageExtendedFormats:
spv_check_supported(storage_image_extended_formats, cap);
break;
case SpvCapabilityImageMSArray: case SpvCapabilityImageMSArray:
spv_check_supported(image_ms_array, cap); spv_check_supported(image_ms_array, cap);
break; break;