Module: Mesa Branch: main Commit: 85cfa21e04c7592aba95e9312919d2167aa65ddf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85cfa21e04c7592aba95e9312919d2167aa65ddf
Author: Jason Ekstrand <[email protected]> Date: Fri Sep 2 23:37:09 2022 -0500 hasvk: Drop remnants of ray queries Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19852> --- src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c | 17 ----------------- src/intel/vulkan_hasvk/anv_pipeline.c | 4 ---- src/intel/vulkan_hasvk/anv_private.h | 7 ------- 3 files changed, 28 deletions(-) diff --git a/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c index 3fa424cf4d4..b08cb977f43 100644 --- a/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan_hasvk/anv_nir_apply_pipeline_layout.c @@ -1339,21 +1339,6 @@ lower_tex(nir_builder *b, nir_tex_instr *tex, return true; } -static bool -lower_ray_query_globals(nir_builder *b, nir_intrinsic_instr *intrin, - struct apply_pipeline_layout_state *state) -{ - b->cursor = nir_instr_remove(&intrin->instr); - - nir_ssa_def *rq_globals = - nir_load_push_constant(b, 1, 64, nir_imm_int(b, 0), - .base = offsetof(struct anv_push_constants, ray_query_globals), - .range = sizeof_field(struct anv_push_constants, ray_query_globals)); - nir_ssa_def_rewrite_uses(&intrin->dest.ssa, rq_globals); - - return true; -} - static bool apply_pipeline_layout(nir_builder *b, nir_instr *instr, void *_state) { @@ -1394,8 +1379,6 @@ apply_pipeline_layout(nir_builder *b, nir_instr *instr, void *_state) return lower_load_constant(b, intrin, state); case nir_intrinsic_load_base_workgroup_id: return lower_base_workgroup_id(b, intrin, state); - case nir_intrinsic_load_ray_query_global_intel: - return lower_ray_query_globals(b, intrin, state); default: return false; } diff --git a/src/intel/vulkan_hasvk/anv_pipeline.c b/src/intel/vulkan_hasvk/anv_pipeline.c index e986b9aab2e..bdeed3fe9d0 100644 --- a/src/intel/vulkan_hasvk/anv_pipeline.c +++ b/src/intel/vulkan_hasvk/anv_pipeline.c @@ -586,8 +586,6 @@ anv_pipeline_lower_nir(struct anv_pipeline *pipeline, NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_push_const, nir_address_format_32bit_offset); - NIR_PASS(_, nir, brw_nir_lower_ray_queries, &pdevice->info); - /* Apply the actual pipeline layout to UBOs, SSBOs, and textures */ NIR_PASS_V(nir, anv_nir_apply_pipeline_layout, pdevice, pipeline->device->robust_buffer_access, @@ -1091,8 +1089,6 @@ anv_pipeline_add_executables(struct anv_pipeline *pipeline, } else { anv_pipeline_add_executable(pipeline, stage, bin->stats, 0); } - - pipeline->ray_queries = MAX2(pipeline->ray_queries, bin->prog_data->ray_queries); } static void diff --git a/src/intel/vulkan_hasvk/anv_private.h b/src/intel/vulkan_hasvk/anv_private.h index 9b1b2774ebf..42947d6a493 100644 --- a/src/intel/vulkan_hasvk/anv_private.h +++ b/src/intel/vulkan_hasvk/anv_private.h @@ -2584,11 +2584,6 @@ struct anv_cmd_state { * genX(cmd_buffer_emit_hashing_mode)(). */ unsigned current_hash_scale; - - /** - * A buffer used for spill/fill of ray queries. - */ - struct anv_bo * ray_query_shadow_bo; }; #define ANV_MIN_CMD_BUFFER_BATCH_SIZE 8192 @@ -2892,8 +2887,6 @@ struct anv_pipeline { enum anv_pipeline_type type; VkPipelineCreateFlags flags; - uint32_t ray_queries; - struct util_dynarray executables; const struct intel_l3_config * l3_config;
