fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

spirv: Drop GOOGLE suffix from names incorporated to SPIR-V

Browse source 
SPV_GOOGLE_decorate_string and SPV_GOOGLE_hlsl_functionality1 were
incorporated to SPIR-V.  Let's pick the names used by SPIR-V core.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2019-04-22 15:36:38 -07:00
parent 02d140ce9a
commit 9b9f7030c6
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/compiler/spirv/spirv_to_nir.c
View file

@ -502,8 +502,8 @@ vtn_handle_decoration(struct vtn_builder *b, SpvOp opcode,
case SpvOpDecorate:
case SpvOpDecorateId:
case SpvOpMemberDecorate:
case SpvOpDecorateStringGOOGLE:
case SpvOpMemberDecorateStringGOOGLE:
case SpvOpDecorateString:
case SpvOpMemberDecorateString:
case SpvOpExecutionMode:
case SpvOpExecutionModeId: {
struct vtn_value *val = vtn_untyped_value(b, target);
@ -512,11 +512,11 @@ vtn_handle_decoration(struct vtn_builder *b, SpvOp opcode,
switch (opcode) {
case SpvOpDecorate:
case SpvOpDecorateId:
case SpvOpDecorateStringGOOGLE:
case SpvOpDecorateString:
dec->scope = VTN_DEC_DECORATION;
break;
case SpvOpMemberDecorate:
case SpvOpMemberDecorateStringGOOGLE:
case SpvOpMemberDecorateString:
dec->scope = VTN_DEC_STRUCT_MEMBER0 + *(w++);
vtn_fail_if(dec->scope < VTN_DEC_STRUCT_MEMBER0, /* overflow */
"Member argument of OpMemberDecorate too large");
@ -851,8 +851,8 @@ struct_member_decoration_cb(struct vtn_builder *b,
}
break;
case SpvDecorationHlslSemanticGOOGLE:
/* HLSL semantic decorations can safely be ignored by the driver. */
case SpvDecorationUserSemantic:
/* User semantic decorations can safely be ignored by the driver. */
break;
default:
@ -985,7 +985,7 @@ type_decoration_cb(struct vtn_builder *b,
case SpvDecorationOffset:
case SpvDecorationXfbBuffer:
case SpvDecorationXfbStride:
case SpvDecorationHlslSemanticGOOGLE:
case SpvDecorationUserSemantic:
vtn_warn("Decoration only allowed for struct members: %s",
spirv_decoration_to_string(dec->decoration));
break;
@ -3819,8 +3819,8 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpMemberDecorate:
case SpvOpGroupDecorate:
case SpvOpGroupMemberDecorate:
case SpvOpDecorateStringGOOGLE:
case SpvOpMemberDecorateStringGOOGLE:
case SpvOpDecorateString:
case SpvOpMemberDecorateString:
vtn_handle_decoration(b, opcode, w, count);
break;
@ -4029,8 +4029,8 @@ vtn_handle_variable_or_type_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpMemberDecorate:
case SpvOpGroupDecorate:
case SpvOpGroupMemberDecorate:
case SpvOpDecorateStringGOOGLE:
case SpvOpMemberDecorateStringGOOGLE:
case SpvOpDecorateString:
case SpvOpMemberDecorateString:
vtn_fail("Invalid opcode types and variables section");
break;

8
src/compiler/spirv/vtn_variables.c
View file

@ -1556,8 +1556,8 @@ apply_var_decoration(struct vtn_builder *b,
}
break;
case SpvDecorationHlslSemanticGOOGLE:
/* HLSL semantic decorations can safely be ignored by the driver. */
case SpvDecorationUserSemantic:
/* User semantic decorations can safely be ignored by the driver. */
break;
case SpvDecorationRestrictPointerEXT:
@ -1615,8 +1615,8 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
case SpvDecorationCoherent:
vtn_var->access |= ACCESS_COHERENT;
break;
case SpvDecorationHlslCounterBufferGOOGLE:
/* HLSL semantic decorations can safely be ignored by the driver. */
case SpvDecorationCounterBuffer:
/* Counter buffer decorations can safely be ignored by the driver. */
break;
default:
break;