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

nir/spirv: Let OpEntryPoint act as an OpName

Browse Source
This commit is contained in:
Jason Ekstrand
2015-12-30 17:31:51 -08:00
parent 5f7f88524c
commit 149f35bbba
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/glsl/nir/spirv/spirv_to_nir.c
View File

@@ -3223,16 +3223,17 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
assert(w[2] == SpvMemoryModelGLSL450); assert(w[2] == SpvMemoryModelGLSL450);
break; break;
case SpvOpEntryPoint: { case SpvOpEntryPoint:
char *name = vtn_string_literal(b, &w[3], count - 3); /* Let this be a name label regardless */
if (strcmp(name, b->entry_point_name) != 0) b->values[w[2]].name = vtn_string_literal(b, &w[3], count - 3);
if (strcmp(b->values[w[2]].name, b->entry_point_name) != 0)
break; break;
assert(b->entry_point == NULL); assert(b->entry_point == NULL);
b->entry_point = &b->values[w[2]]; b->entry_point = &b->values[w[2]];
b->execution_model = w[1]; b->execution_model = w[1];
break; break;
}
case SpvOpString: case SpvOpString:
vtn_push_value(b, w[1], vtn_value_type_string)->str = vtn_push_value(b, w[1], vtn_value_type_string)->str =