fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 14:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

spirv: Rename some ray-tracing intrinsics to NV

Browse source 
For these intrinsics, the NV version and the provisional KHR version
have the same enum value and semantics but the final KHR version is
different on both counts.  Re-name them to NV before we update the
header so the header update isn't a functional change.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7734>
This commit is contained in:
Jason Ekstrand 2020-10-29 13:14:10 -05:00 • committed by Marge Bot
parent 22c1e09747
commit b15caf190b
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5105,7 +5105,7 @@ vtn_handle_ray_intrinsic(struct vtn_builder *b, SpvOp opcode,
nir_intrinsic_instr *intrin;
switch (opcode) {
case SpvOpTraceRayKHR: {
case SpvOpTraceNV: {
intrin = nir_intrinsic_instr_create(b->nb.shader,
nir_intrinsic_trace_ray);
@ -5130,19 +5130,19 @@ vtn_handle_ray_intrinsic(struct vtn_builder *b, SpvOp opcode,
break;
}
case SpvOpIgnoreIntersectionKHR:
case SpvOpIgnoreIntersectionNV:
intrin = nir_intrinsic_instr_create(b->nb.shader,
nir_intrinsic_ignore_ray_intersection);
nir_builder_instr_insert(&b->nb, &intrin->instr);
break;
case SpvOpTerminateRayKHR:
case SpvOpTerminateRayNV:
intrin = nir_intrinsic_instr_create(b->nb.shader,
nir_intrinsic_terminate_ray);
nir_builder_instr_insert(&b->nb, &intrin->instr);
break;
case SpvOpExecuteCallableKHR: {
case SpvOpExecuteCallableNV: {
intrin = nir_intrinsic_instr_create(b->nb.shader,
nir_intrinsic_execute_callable);
intrin->src[0] = nir_src_for_ssa(vtn_ssa_value(b, w[1])->def);
@ -5566,11 +5566,11 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode,
break;
}
case SpvOpTraceRayKHR:
case SpvOpTraceNV:
case SpvOpReportIntersectionKHR:
case SpvOpIgnoreIntersectionKHR:
case SpvOpTerminateRayKHR:
case SpvOpExecuteCallableKHR:
case SpvOpIgnoreIntersectionNV:
case SpvOpTerminateRayNV:
case SpvOpExecuteCallableNV:
vtn_handle_ray_intrinsic(b, opcode, w, count);
break;