Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix GPU BVH shader compilation for macOS/iOS

Browse Source
This commit is contained in:
Wojciech Figat
2025-11-20 10:39:16 +01:00
parent ee0303bcfb
commit a1cb7dcbe7
3 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content/Shaders/SDF.flax
LFS
BIN
View File
Binary file not shown.
Source/Shaders/MeshAccelerationStructure.hlsl
+17 -20
View File
@@ -16,13 +16,10 @@ struct BVHNode
int Count; // Negative for non-leaf nodes int Count; // Negative for non-leaf nodes
}; };
struct BVHBuffers // Pass all data via separate params (SPIR-V doesn't support buffers in structures)
{ #define BVHBuffers_Param StructuredBuffer<BVHNode> BVHBuffer, ByteAddressBuffer VertexBuffer, ByteAddressBuffer IndexBuffer, uint VertexStride
StructuredBuffer<BVHNode> BVHBuffer; #define BVHBuffers_Init(BVHBuffer, VertexBuffer, IndexBuffer, VertexStride) BVHBuffer, VertexBuffer, IndexBuffer, VertexStride
ByteAddressBuffer VertexBuffer; #define BVHBuffers_Pass BVHBuffers_Init(BVHBuffer, VertexBuffer, IndexBuffer, VertexStride)
ByteAddressBuffer IndexBuffer;
uint VertexStride;
};
struct BVHHit struct BVHHit
{ {
@@ -30,11 +27,11 @@ struct BVHHit
bool IsBackface; bool IsBackface;
}; };
float3 LoadVertexBVH(BVHBuffers bvh, uint index) float3 LoadVertexBVH(BVHBuffers_Param, uint index)
{ {
int addr = index << 2u; int addr = index << 2u;
uint vertexIndex = bvh.IndexBuffer.Load(addr); uint vertexIndex = IndexBuffer.Load(addr);
return asfloat(bvh.VertexBuffer.Load3(vertexIndex * bvh.VertexStride)); return asfloat(VertexBuffer.Load3(vertexIndex * VertexStride));
} }
// [https://tavianator.com/2011/ray_box.html] // [https://tavianator.com/2011/ray_box.html]
@@ -52,7 +49,7 @@ float RayTestBoxBVH(float3 rayPos, float3 rayDir, float3 boxMin, float3 boxMax)
} }
// Performs raytracing against the BVH acceleration structure to find the closest intersection with a triangle. // Performs raytracing against the BVH acceleration structure to find the closest intersection with a triangle.
bool RayCastBVH(BVHBuffers bvh, float3 rayPos, float3 rayDir, out BVHHit hit, float maxDistance = 1000000.0f) bool RayCastBVH(BVHBuffers_Param, float3 rayPos, float3 rayDir, out BVHHit hit, float maxDistance = 1000000.0f)
{ {
hit = (BVHHit)0; hit = (BVHHit)0;
hit.Distance = maxDistance; hit.Distance = maxDistance;
@@ -66,7 +63,7 @@ bool RayCastBVH(BVHBuffers bvh, float3 rayPos, float3 rayDir, out BVHHit hit, fl
LOOP LOOP
while (stackCount > 0) while (stackCount > 0)
{ {
BVHNode node = bvh.BVHBuffer[stack[--stackCount]]; BVHNode node = BVHBuffer[stack[--stackCount]];
// Raytrace bounds // Raytrace bounds
float boundsHit = RayTestBoxBVH(rayPos, rayDir, node.BoundsMin, node.BoundsMax); float boundsHit = RayTestBoxBVH(rayPos, rayDir, node.BoundsMin, node.BoundsMax);
@@ -82,9 +79,9 @@ bool RayCastBVH(BVHBuffers bvh, float3 rayPos, float3 rayDir, out BVHHit hit, fl
for (uint i = indexStart; i < indexEnd;) for (uint i = indexStart; i < indexEnd;)
{ {
// Load triangle // Load triangle
float3 v0 = LoadVertexBVH(bvh, i++); float3 v0 = LoadVertexBVH(BVHBuffers_Pass, i++);
float3 v1 = LoadVertexBVH(bvh, i++); float3 v1 = LoadVertexBVH(BVHBuffers_Pass, i++);
float3 v2 = LoadVertexBVH(bvh, i++); float3 v2 = LoadVertexBVH(BVHBuffers_Pass, i++);
// Raytrace triangle // Raytrace triangle
float distance; float distance;
@@ -109,7 +106,7 @@ bool RayCastBVH(BVHBuffers bvh, float3 rayPos, float3 rayDir, out BVHHit hit, fl
} }
// Performs a query against the BVH acceleration structure to find the closest distance to a triangle from a given point. // Performs a query against the BVH acceleration structure to find the closest distance to a triangle from a given point.
bool PointQueryBVH(BVHBuffers bvh, float3 pos, out BVHHit hit, float maxDistance = 1000000.0f) bool PointQueryBVH(BVHBuffers_Param, float3 pos, out BVHHit hit, float maxDistance = 1000000.0f)
{ {
hit = (BVHHit)0; hit = (BVHHit)0;
hit.Distance = maxDistance; hit.Distance = maxDistance;
@@ -123,7 +120,7 @@ bool PointQueryBVH(BVHBuffers bvh, float3 pos, out BVHHit hit, float maxDistance
LOOP LOOP
while (stackCount > 0) while (stackCount > 0)
{ {
BVHNode node = bvh.BVHBuffer[stack[--stackCount]]; BVHNode node = BVHBuffer[stack[--stackCount]];
// Skip too far nodes // Skip too far nodes
if (PointDistanceBox(node.BoundsMin, node.BoundsMax, pos) >= hit.Distance) if (PointDistanceBox(node.BoundsMin, node.BoundsMax, pos) >= hit.Distance)
@@ -138,9 +135,9 @@ bool PointQueryBVH(BVHBuffers bvh, float3 pos, out BVHHit hit, float maxDistance
for (uint i = indexStart; i < indexEnd;) for (uint i = indexStart; i < indexEnd;)
{ {
// Load triangle // Load triangle
float3 v0 = LoadVertexBVH(bvh, i++); float3 v0 = LoadVertexBVH(BVHBuffers_Pass, i++);
float3 v1 = LoadVertexBVH(bvh, i++); float3 v1 = LoadVertexBVH(BVHBuffers_Pass, i++);
float3 v2 = LoadVertexBVH(bvh, i++); float3 v2 = LoadVertexBVH(BVHBuffers_Pass, i++);
// Check triangle // Check triangle
float distance = sqrt(DistancePointToTriangle2(pos, v0, v1, v2)); float distance = sqrt(DistancePointToTriangle2(pos, v0, v1, v2));
Source/Shaders/SDF.shader
+2 -8
View File
@@ -77,15 +77,9 @@ void CS_RasterizeTriangles(uint3 GroupId : SV_GroupID, uint3 GroupThreadID : SV_
int3 voxelCoord = GetVoxelCoord(voxelIndex); int3 voxelCoord = GetVoxelCoord(voxelIndex);
float3 voxelPos = GetVoxelPos(voxelCoord); float3 voxelPos = GetVoxelPos(voxelCoord);
BVHBuffers bvh;
bvh.BVHBuffer = BVHBuffer;
bvh.VertexBuffer = VertexBuffer;
bvh.IndexBuffer = IndexBuffer;
bvh.VertexStride = VertexStride;
// Point query to find the distance to the closest surface // Point query to find the distance to the closest surface
BVHHit hit; BVHHit hit;
PointQueryBVH(bvh, voxelPos, hit, MaxDistance); PointQueryBVH(BVHBuffers_Init(BVHBuffer, VertexBuffer, IndexBuffer, VertexStride), voxelPos, hit, MaxDistance);
float sdf = hit.Distance; float sdf = hit.Distance;
// Raycast triangles around voxel to count triangle backfaces hit // Raycast triangles around voxel to count triangle backfaces hit
@@ -104,7 +98,7 @@ void CS_RasterizeTriangles(uint3 GroupId : SV_GroupID, uint3 GroupThreadID : SV_
for (uint i = 0; i < CLOSEST_CACHE_SIZE; i++) for (uint i = 0; i < CLOSEST_CACHE_SIZE; i++)
{ {
float3 rayDir = closestDirections[i]; float3 rayDir = closestDirections[i];
if (RayCastBVH(bvh, voxelPos, rayDir, hit, MaxDistance)) if (RayCastBVH(BVHBuffers_Init(BVHBuffer, VertexBuffer, IndexBuffer, VertexStride), voxelPos, rayDir, hit, MaxDistance))
{ {
sdf = min(sdf, hit.Distance); sdf = min(sdf, hit.Distance);
if (hit.IsBackface) if (hit.IsBackface)