From 410ca6a3e99c5c1c9c91f0f79bf43a35103cbd98 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Mon, 9 Jan 2023 17:31:47 -0800 Subject: [PATCH] Revert "anv: Disable Ray Tracing on xe2 until our compiler supports Xe2 RT" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 65684b0c7f852d8acaced018e0684da981cf6211. Reviewed-by: José Roberto de Souza Part-of: --- src/intel/vulkan/genX_acceleration_structure.c | 2 +- src/intel/vulkan/genX_init_state.c | 4 ++-- src/intel/vulkan/genX_query.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/genX_acceleration_structure.c b/src/intel/vulkan/genX_acceleration_structure.c index db5c34cdcdb..2892b8cb021 100644 --- a/src/intel/vulkan/genX_acceleration_structure.c +++ b/src/intel/vulkan/genX_acceleration_structure.c @@ -35,7 +35,7 @@ #include "ds/intel_tracepoints.h" -#if GFX_VERx10 == 125 +#if GFX_VERx10 >= 125 #include "grl/grl_structs.h" /* Wait for the previous dispatches to finish and flush their data port diff --git a/src/intel/vulkan/genX_init_state.c b/src/intel/vulkan/genX_init_state.c index a8ae826f129..13316958522 100644 --- a/src/intel/vulkan/genX_init_state.c +++ b/src/intel/vulkan/genX_init_state.c @@ -31,7 +31,7 @@ #include "vk_standard_sample_locations.h" -#if GFX_VERx10 == 125 && ANV_SUPPORT_RT +#if GFX_VERx10 >= 125 && ANV_SUPPORT_RT #include "grl/genX_grl.h" #endif @@ -764,7 +764,7 @@ void genX(init_physical_device_state)(ASSERTED struct anv_physical_device *pdevice) { assert(pdevice->info.verx10 == GFX_VERx10); -#if GFX_VERx10 == 125 && ANV_SUPPORT_RT +#if GFX_VERx10 >= 125 && ANV_SUPPORT_RT genX(grl_load_rt_uuid)(pdevice->rt_uuid); pdevice->max_grl_scratch_size = genX(grl_max_scratch_size)(); #endif diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c index 2cb492afcf9..c98e4ffede9 100644 --- a/src/intel/vulkan/genX_query.c +++ b/src/intel/vulkan/genX_query.c @@ -1875,7 +1875,7 @@ void genX(CmdCopyQueryPoolResults)( } } -#if GFX_VERx10 == 125 && ANV_SUPPORT_RT +#if GFX_VERx10 >= 125 && ANV_SUPPORT_RT #include "grl/include/GRLRTASCommon.h" #include "grl/grl_metakernel_postbuild_info.h"