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

spirv: Drop EXT for PhysicalStorageBuffer symbols

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3322>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2020-01-08 13:25:59 -08:00
parent dfaa3c0af6
commit 1ec0d4fdff
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1348,7 +1348,7 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
case SpvStorageClassUniform: case SpvStorageClassUniform:
case SpvStorageClassPushConstant: case SpvStorageClassPushConstant:
case SpvStorageClassStorageBuffer: case SpvStorageClassStorageBuffer:
case SpvStorageClassPhysicalStorageBufferEXT: case SpvStorageClassPhysicalStorageBuffer:
vtn_foreach_decoration(b, val, array_stride_decoration_cb, NULL); vtn_foreach_decoration(b, val, array_stride_decoration_cb, NULL);
break; break;
default: default:
@@ -1937,7 +1937,7 @@ vtn_storage_class_to_memory_semantics(SpvStorageClass sc)
{ {
switch (sc) { switch (sc) {
case SpvStorageClassStorageBuffer: case SpvStorageClassStorageBuffer:
case SpvStorageClassPhysicalStorageBufferEXT: case SpvStorageClassPhysicalStorageBuffer:
return SpvMemorySemanticsUniformMemoryMask; return SpvMemorySemanticsUniformMemoryMask;
case SpvStorageClassWorkgroup: case SpvStorageClassWorkgroup:
return SpvMemorySemanticsWorkgroupMemoryMask; return SpvMemorySemanticsWorkgroupMemoryMask;
@@ -4074,7 +4074,7 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
spv_check_supported(float_controls, cap); spv_check_supported(float_controls, cap);
break; break;
case SpvCapabilityPhysicalStorageBufferAddressesEXT: case SpvCapabilityPhysicalStorageBufferAddresses:
spv_check_supported(physical_storage_buffer_address, cap); spv_check_supported(physical_storage_buffer_address, cap);
break; break;
@@ -4151,10 +4151,10 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
"AddressingModelLogical only supported for shaders"); "AddressingModelLogical only supported for shaders");
b->physical_ptrs = false; b->physical_ptrs = false;
break; break;
case SpvAddressingModelPhysicalStorageBuffer64EXT: case SpvAddressingModelPhysicalStorageBuffer64:
vtn_fail_if(!b->options || vtn_fail_if(!b->options ||
!b->options->caps.physical_storage_buffer_address, !b->options->caps.physical_storage_buffer_address,
"AddressingModelPhysicalStorageBuffer64EXT not supported"); "AddressingModelPhysicalStorageBuffer64 not supported");
break; break;
default: default:
vtn_fail("Unknown addressing model: %s (%u)", vtn_fail("Unknown addressing model: %s (%u)",

12
src/compiler/spirv/vtn_variables.c
View File

@@ -1811,7 +1811,7 @@ vtn_storage_class_to_mode(struct vtn_builder *b,
mode = vtn_variable_mode_ssbo; mode = vtn_variable_mode_ssbo;
nir_mode = nir_var_mem_ssbo; nir_mode = nir_var_mem_ssbo;
break; break;
case SpvStorageClassPhysicalStorageBufferEXT: case SpvStorageClassPhysicalStorageBuffer:
mode = vtn_variable_mode_phys_ssbo; mode = vtn_variable_mode_phys_ssbo;
nir_mode = nir_var_mem_global; nir_mode = nir_var_mem_global;
break; break;
@@ -1951,10 +1951,10 @@ vtn_pointer_to_ssa(struct vtn_builder *b, struct vtn_pointer *ptr)
/* In this case, we're looking for a block index and not an actual /* In this case, we're looking for a block index and not an actual
* deref. * deref.
* *
* For PhysicalStorageBufferEXT pointers, we don't have a block index * For PhysicalStorageBuffer pointers, we don't have a block index
* at all because we get the pointer directly from the client. This * at all because we get the pointer directly from the client. This
* assumes that there will never be a SSBO binding variable using the * assumes that there will never be a SSBO binding variable using the
* PhysicalStorageBufferEXT storage class. This assumption appears * PhysicalStorageBuffer storage class. This assumption appears
* to be correct according to the Vulkan spec because the table, * to be correct according to the Vulkan spec because the table,
* "Shader Resource and Storage Class Correspondence," the only the * "Shader Resource and Storage Class Correspondence," the only the
* Uniform storage class with BufferBlock or the StorageBuffer * Uniform storage class with BufferBlock or the StorageBuffer
@@ -2038,10 +2038,10 @@ vtn_pointer_from_ssa(struct vtn_builder *b, nir_ssa_def *ssa,
/* This is a pointer to something internal or a pointer inside a /* This is a pointer to something internal or a pointer inside a
* block. It's just a regular cast. * block. It's just a regular cast.
* *
* For PhysicalStorageBufferEXT pointers, we don't have a block index * For PhysicalStorageBuffer pointers, we don't have a block index
* at all because we get the pointer directly from the client. This * at all because we get the pointer directly from the client. This
* assumes that there will never be a SSBO binding variable using the * assumes that there will never be a SSBO binding variable using the
* PhysicalStorageBufferEXT storage class. This assumption appears * PhysicalStorageBuffer storage class. This assumption appears
* to be correct according to the Vulkan spec because the table, * to be correct according to the Vulkan spec because the table,
* "Shader Resource and Storage Class Correspondence," the only the * "Shader Resource and Storage Class Correspondence," the only the
* Uniform storage class with BufferBlock or the StorageBuffer * Uniform storage class with BufferBlock or the StorageBuffer
@@ -2175,7 +2175,7 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
case vtn_variable_mode_phys_ssbo: case vtn_variable_mode_phys_ssbo:
vtn_fail("Cannot create a variable with the " vtn_fail("Cannot create a variable with the "
"PhysicalStorageBufferEXT storage class"); "PhysicalStorageBuffer storage class");
break; break;
default: default: