mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-02-21 16:30:29 +01:00
radv: Move accel struct structs to bvh/bvh.h
Moves all the acceleration structure structs to bvh/bvh.h so that thay can be used in build kernels. Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17028>
This commit is contained in:
Konstantin Seurer
Marge Bot
parent
ec45430205
commit
0e48165411
3 changed files with 117 additions and 83 deletions
114
src/amd/vulkan/bvh/bvh.h
Normal file
114
src/amd/vulkan/bvh/bvh.h
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
/*
|
||||
* Copyright © 2021 Bas Nieuwenhuizen
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef BVH_BVH_H
|
||||
#define BVH_BVH_H
|
||||
|
||||
#define radv_bvh_node_triangle 0
|
||||
#define radv_bvh_node_internal 5
|
||||
#define radv_bvh_node_instance 6
|
||||
#define radv_bvh_node_aabb 7
|
||||
|
||||
#ifdef VULKAN
|
||||
#define VK_UUID_SIZE 16
|
||||
#else
|
||||
#include <vulkan/vulkan.h>
|
||||
#endif
|
||||
|
||||
struct radv_accel_struct_serialization_header {
|
||||
uint8_t driver_uuid[VK_UUID_SIZE];
|
||||
uint8_t accel_struct_compat[VK_UUID_SIZE];
|
||||
uint64_t serialization_size;
|
||||
uint64_t compacted_size;
|
||||
uint64_t instance_count;
|
||||
#ifndef VULKAN
|
||||
uint64_t instances[];
|
||||
#endif
|
||||
};
|
||||
|
||||
struct radv_accel_struct_header {
|
||||
uint32_t root_node_offset;
|
||||
uint32_t reserved;
|
||||
float aabb[2][3];
|
||||
|
||||
/* Everything after this gets updated/copied from the CPU. */
|
||||
uint64_t compacted_size;
|
||||
uint64_t serialization_size;
|
||||
uint32_t copy_dispatch_size[3];
|
||||
uint32_t reserved2;
|
||||
uint64_t instance_offset;
|
||||
uint64_t instance_count;
|
||||
uint64_t size;
|
||||
};
|
||||
|
||||
struct radv_bvh_triangle_node {
|
||||
float coords[3][3];
|
||||
uint32_t reserved[3];
|
||||
uint32_t triangle_id;
|
||||
/* flags in upper 4 bits */
|
||||
uint32_t geometry_id_and_flags;
|
||||
uint32_t reserved2;
|
||||
uint32_t id;
|
||||
};
|
||||
|
||||
struct radv_bvh_aabb_node {
|
||||
float aabb[2][3];
|
||||
uint32_t primitive_id;
|
||||
/* flags in upper 4 bits */
|
||||
uint32_t geometry_id_and_flags;
|
||||
uint32_t reserved[8];
|
||||
};
|
||||
|
||||
struct radv_bvh_instance_node {
|
||||
uint64_t base_ptr;
|
||||
/* lower 24 bits are the custom instance index, upper 8 bits are the visibility mask */
|
||||
uint32_t custom_instance_and_mask;
|
||||
/* lower 24 bits are the sbt offset, upper 8 bits are VkGeometryInstanceFlagsKHR */
|
||||
uint32_t sbt_offset_and_flags;
|
||||
|
||||
/* The translation component is actually a pre-translation instead of a post-translation. If you
|
||||
* want to get a proper matrix out of it you need to apply the directional component of the
|
||||
* matrix to it. The pre-translation of the world->object matrix is the same as the
|
||||
* post-translation of the object->world matrix so this way we can share data between both
|
||||
* matrices. */
|
||||
float wto_matrix[12];
|
||||
float aabb[2][3];
|
||||
uint32_t instance_id;
|
||||
|
||||
/* Object to world matrix transposed from the initial transform. Translate part is store in the
|
||||
* wto_matrix. */
|
||||
float otw_matrix[9];
|
||||
};
|
||||
|
||||
struct radv_bvh_box16_node {
|
||||
uint32_t children[4];
|
||||
uint32_t coords[4][3];
|
||||
};
|
||||
|
||||
struct radv_bvh_box32_node {
|
||||
uint32_t children[4];
|
||||
float coords[4][2][3];
|
||||
uint32_t reserved[4];
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -31,6 +31,7 @@ radv_entrypoints = custom_target(
|
|||
)
|
||||
|
||||
libradv_files = files(
|
||||
'bvh/bvh.h',
|
||||
'layers/radv_metro_exodus.c',
|
||||
'layers/radv_sqtt_layer.c',
|
||||
'winsys/null/radv_null_bo.c',
|
||||
|
|
|
|||
|
|
@ -24,87 +24,6 @@
|
|||
#ifndef RADV_ACCELERATION_STRUCTURE_H
|
||||
#define RADV_ACCELERATION_STRUCTURE_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <vulkan/vulkan.h>
|
||||
#include "bvh/bvh.h"
|
||||
|
||||
enum radv_bvh_node_type {
|
||||
radv_bvh_node_triangle = 0,
|
||||
radv_bvh_node_internal = 5,
|
||||
radv_bvh_node_instance = 6,
|
||||
radv_bvh_node_aabb = 7,
|
||||
};
|
||||
|
||||
struct radv_accel_struct_serialization_header {
|
||||
uint8_t driver_uuid[VK_UUID_SIZE];
|
||||
uint8_t accel_struct_compat[VK_UUID_SIZE];
|
||||
uint64_t serialization_size;
|
||||
uint64_t compacted_size;
|
||||
uint64_t instance_count;
|
||||
uint64_t instances[];
|
||||
};
|
||||
|
||||
struct radv_accel_struct_header {
|
||||
uint32_t root_node_offset;
|
||||
uint32_t reserved;
|
||||
float aabb[2][3];
|
||||
|
||||
/* Everything after this gets updated/copied from the CPU. */
|
||||
uint64_t compacted_size;
|
||||
uint64_t serialization_size;
|
||||
uint32_t copy_dispatch_size[3];
|
||||
uint64_t instance_offset;
|
||||
uint64_t instance_count;
|
||||
uint64_t size;
|
||||
};
|
||||
|
||||
struct radv_bvh_triangle_node {
|
||||
float coords[3][3];
|
||||
uint32_t reserved[3];
|
||||
uint32_t triangle_id;
|
||||
/* flags in upper 4 bits */
|
||||
uint32_t geometry_id_and_flags;
|
||||
uint32_t reserved2;
|
||||
uint32_t id;
|
||||
};
|
||||
|
||||
struct radv_bvh_aabb_node {
|
||||
float aabb[2][3];
|
||||
uint32_t primitive_id;
|
||||
/* flags in upper 4 bits */
|
||||
uint32_t geometry_id_and_flags;
|
||||
uint32_t reserved[8];
|
||||
};
|
||||
|
||||
struct radv_bvh_instance_node {
|
||||
uint64_t base_ptr;
|
||||
/* lower 24 bits are the custom instance index, upper 8 bits are the visibility mask */
|
||||
uint32_t custom_instance_and_mask;
|
||||
/* lower 24 bits are the sbt offset, upper 8 bits are VkGeometryInstanceFlagsKHR */
|
||||
uint32_t sbt_offset_and_flags;
|
||||
|
||||
/* The translation component is actually a pre-translation instead of a post-translation. If you
|
||||
* want to get a proper matrix out of it you need to apply the directional component of the
|
||||
* matrix to it. The pre-translation of the world->object matrix is the same as the
|
||||
* post-translation of the object->world matrix so this way we can share data between both
|
||||
* matrices. */
|
||||
float wto_matrix[12];
|
||||
float aabb[2][3];
|
||||
uint32_t instance_id;
|
||||
|
||||
/* Object to world matrix transposed from the initial transform. Translate part is store in the
|
||||
* wto_matrix. */
|
||||
float otw_matrix[9];
|
||||
};
|
||||
|
||||
struct radv_bvh_box16_node {
|
||||
uint32_t children[4];
|
||||
uint32_t coords[4][3];
|
||||
};
|
||||
|
||||
struct radv_bvh_box32_node {
|
||||
uint32_t children[4];
|
||||
float coords[4][2][3];
|
||||
uint32_t reserved[4];
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue