--amend

RenderKit · Jan 17, 2025 · 982feab · 982feab
1 parent 5d26bbe
commit 982feab
Show file tree

Hide file tree

Showing 6 changed files with 281 additions and 80 deletions.
diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json
diff --git a/kernels/level_zero/ze_api.h b/kernels/level_zero/ze_api.h
@@ -9257,6 +9257,9 @@ typedef enum _ze_rtas_device_exp_flag_t
 typedef enum _ze_rtas_format_exp_t
 {
     ZE_RTAS_FORMAT_EXP_INVALID = 0,                                         ///< Invalid acceleration structure format
+    ZE_RTAS_FORMAT_EXP_VERSION_1 = 1,
+    ZE_RTAS_FORMAT_EXP_VERSION_2 = 2,
+    ZE_RTAS_FORMAT_EXP_VERSION_MAX = 2,
     ZE_RTAS_FORMAT_EXP_FORCE_UINT32 = 0x7fffffff
 
 } ze_rtas_format_exp_t;

diff --git a/kernels/level_zero/ze_rtas.h b/kernels/level_zero/ze_rtas.h
@@ -132,6 +132,9 @@ typedef enum _ze_rtas_device_exp_flag_t
 typedef enum _ze_rtas_format_exp_t
 {
     ZE_RTAS_FORMAT_EXP_INVALID = 0,                                         ///< Invalid acceleration structure format
+    ZE_RTAS_FORMAT_EXP_VERSION_1 = 1,
+    ZE_RTAS_FORMAT_EXP_VERSION_2 = 2,
+    ZE_RTAS_FORMAT_EXP_VERSION_MAX = 2,
     ZE_RTAS_FORMAT_EXP_FORCE_UINT32 = 0x7fffffff
 
 } ze_rtas_format_exp_t;

diff --git a/kernels/level_zero/ze_wrapper.cpp b/kernels/level_zero/ze_wrapper.cpp
@@ -131,16 +131,16 @@ void selectInternalRTASBuilder()
   if (ZeWrapper::rtas_builder == ZeWrapper::INTERNAL)
     return;
 
-  zeRTASBuilderCreateExpInternal = &zeRTASBuilderCreateExpImpl;
-  zeRTASBuilderDestroyExpInternal = &zeRTASBuilderDestroyExpImpl;
-  zeDriverRTASFormatCompatibilityCheckExpInternal = &zeDriverRTASFormatCompatibilityCheckExpImpl;
-  zeRTASBuilderGetBuildPropertiesExpInternal = &zeRTASBuilderGetBuildPropertiesExpImpl;
-  zeRTASBuilderBuildExpInternal = &zeRTASBuilderBuildExpImpl;
+  zeRTASBuilderCreateExpInternal = &zeRTASBuilderCreateExp;
+  zeRTASBuilderDestroyExpInternal = &zeRTASBuilderDestroyExp;
+  zeDriverRTASFormatCompatibilityCheckExpInternal = &zeDriverRTASFormatCompatibilityCheckExp;
+  zeRTASBuilderGetBuildPropertiesExpInternal = &zeRTASBuilderGetBuildPropertiesExp;
+  zeRTASBuilderBuildExpInternal = &zeRTASBuilderBuildExp;
 
-  zeRTASParallelOperationCreateExpInternal = &zeRTASParallelOperationCreateExpImpl;
-  zeRTASParallelOperationDestroyExpInternal = &zeRTASParallelOperationDestroyExpImpl;
-  zeRTASParallelOperationGetPropertiesExpInternal = &zeRTASParallelOperationGetPropertiesExpImpl;
-  zeRTASParallelOperationJoinExpInternal = &zeRTASParallelOperationJoinExpImpl;
+  zeRTASParallelOperationCreateExpInternal = &zeRTASParallelOperationCreateExp;
+  zeRTASParallelOperationDestroyExpInternal = &zeRTASParallelOperationDestroyExp;
+  zeRTASParallelOperationGetPropertiesExpInternal = &zeRTASParallelOperationGetPropertiesExp;
+  zeRTASParallelOperationJoinExpInternal = &zeRTASParallelOperationJoinExp;
 
   ZeWrapper::rtas_builder = ZeWrapper::INTERNAL;
 #endif
@@ -288,7 +288,7 @@ ze_result_t zeDeviceGetRTASPropertiesExp( const ze_device_handle_t hDevice, ze_r
 
   /* fill properties */
   pProperties->flags = 0;
-  pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_DEVICE_FORMAT_EXP_INVALID;
+  pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_FORMAT_EXP_INVALID;
   pProperties->rtasBufferAlignment = 128;
 
   /* check for supported device ID */
@@ -305,7 +305,7 @@ ze_result_t zeDeviceGetRTASPropertiesExp( const ze_device_handle_t hDevice, ze_r
   /* disabling of device check through env variable */
   const char* disable_device_check = std::getenv("EMBREE_DISABLE_DEVICEID_CHECK");
   if (disable_device_check && strcmp(disable_device_check,"1") == 0) {
-    pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1;
+    pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_FORMAT_EXP_VERSION_1;
     return ZE_RESULT_SUCCESS;
   }
 
@@ -318,7 +318,7 @@ ze_result_t zeDeviceGetRTASPropertiesExp( const ze_device_handle_t hDevice, ze_r
     (0x56C0 <= device_id && device_id <= 0x56C1);
 
   if (dg2) {
-    pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1;
+    pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_FORMAT_EXP_VERSION_1;
     return ZE_RESULT_SUCCESS;
   }
 
@@ -330,7 +330,7 @@ ze_result_t zeDeviceGetRTASPropertiesExp( const ze_device_handle_t hDevice, ze_r
     (device_id == 0x0BD4);
 
   if (pvc) {
-    pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1;
+    pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_FORMAT_EXP_VERSION_1;
     return ZE_RESULT_SUCCESS;
   }
 
@@ -343,7 +343,7 @@ ze_result_t zeDeviceGetRTASPropertiesExp( const ze_device_handle_t hDevice, ze_r
     (device_id == 0x7D60);
 
   if (mtl) {
-    pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1;
+    pProperties->rtasFormat = (ze_rtas_format_exp_t) ZE_RTAS_FORMAT_EXP_VERSION_1;
     return ZE_RESULT_SUCCESS;
   }
 

diff --git a/kernels/sycl/rthwif_embree.cpp b/kernels/sycl/rthwif_embree.cpp
@@ -23,6 +23,7 @@
 #include "../geometry/triangle_intersector_pluecker.h"
 
 #include "rthwif_embree.h"
+#include "rthwif_rttrace.h"
 
 using namespace embree;