KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spirv: switch to uint64 for rayquery internal type 

Fixes dEQP-VK.ray_query.advanced.using_wrapper_function.comp.*

An empty struct is causing problems because when passing it as
argument the spirv parser will just drop the argument, considering it
does not hold any data.

v2: update radv CI

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 4c703686db ("spirv: handle ray query intrinsics")
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17420>
This commit is contained in:
Lionel Landwerlin 2022-07-08 14:38:35 +03:00 committed by Marge Bot
parent 05552b4688
commit a41e8dc588
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/ci/radv-navi21-aco-fails.txt
View File

@ -6,10 +6,6 @@ dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_2.mu
dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_4.multi_draw_barriers,Fail
dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_8.multi_draw_barriers,Fail
# Those cases crash in spirv to nir.
dEQP-VK.ray_query.advanced.using_wrapper_function.comp.triangles,Crash
dEQP-VK.ray_query.advanced.using_wrapper_function.comp.aabbs,Crash
# New fails in CTS 1.3.3.0
dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.cpu.access_sbt_read,Crash
dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.cpu.stage_all_transfer,Crash

4
src/amd/ci/radv-navi22-aco-fails.txt
View File

@ -7,10 +7,6 @@ dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_2.mu
dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_4.multi_draw_barriers,Fail
dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_8.multi_draw_barriers,Fail
# Those cases crash in spirv to nir.
dEQP-VK.ray_query.advanced.using_wrapper_function.comp.triangles,Crash
dEQP-VK.ray_query.advanced.using_wrapper_function.comp.aabbs,Crash
# New fails in CTS 1.3.3.0
dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.cpu.access_sbt_read,Crash
dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.cpu.stage_all_transfer,Crash

4
src/amd/ci/radv-vangogh-aco-fails.txt
View File

@ -10,10 +10,6 @@ dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_2.mu
dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_4.multi_draw_barriers,Fail
dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_8.multi_draw_barriers,Fail
# Those cases crash in spirv to nir.
dEQP-VK.ray_query.advanced.using_wrapper_function.comp.triangles,Crash
dEQP-VK.ray_query.advanced.using_wrapper_function.comp.aabbs,Crash
# New fails in CTS 1.3.3.0
dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.cpu.access_sbt_read,Crash
dEQP-VK.ray_tracing_pipeline.acceleration_structures.copy_within_pipeline.cpu.stage_all_transfer,Crash

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

@ -1826,8 +1826,7 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
case SpvOpTypeRayQueryKHR: {
val->type->base_type = vtn_base_type_ray_query;
const char *name = "RayQueryKHR";
val->type->type = glsl_struct_type(NULL, 0, name, false);
val->type->type = glsl_uint64_t_type();
/* We may need to run queries on helper invocations. Here the parser
* doesn't go through a deeper analysis on whether the result of a query
* will be used in derivative instructions.