Pinning down the issue

This commit is contained in:
Dynamitos
2024-10-21 16:49:58 +02:00
parent 07dad4641d
commit 6506287474
7 changed files with 1136 additions and 785 deletions
+107 -64
View File
@@ -10,38 +10,48 @@ void Reset()
ResetBuffers();
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
void Classify(uint currentID : SV_DispatchThreadID)
[numthreads(1, 1, 1)]
void Classify(uint dispatchID : SV_DispatchThreadID)
{
// This thread doesn't have any work to do, we're done
if (currentID >= pParams.indirectDrawBuffer[9])
if(dispatchID > 0)
return;
for(uint i = 0; i < pParams.indirectDrawBuffer[9]; ++i)
{
// This thread doesn't have any work to do, we're done
//if (currentID >= pParams.indirectDrawBuffer[9])
// return;
// Operate the indirection
currentID = pParams.indexedBisectorBuffer[currentID];
// Operate the indirection
uint currentID = pParams.indexedBisectorBuffer[i];
// Read the current geometry data
BisectorGeometry bis;
bis.p[0] = pParams.currentVertexBuffer[3 * currentID].xyz;
bis.p[1] = pParams.currentVertexBuffer[3 * currentID + 1].xyz;
bis.p[2] = pParams.currentVertexBuffer[3 * currentID + 2].xyz;
bis.p[3] = pParams.currentVertexBuffer[3 * pParams.geometry.totalNumElements + currentID].xyz;
// Read the current geometry data
BisectorGeometry bis;
bis.p[0] = pParams.currentVertexBuffer[3 * currentID].xyz;
bis.p[1] = pParams.currentVertexBuffer[3 * currentID + 1].xyz;
bis.p[2] = pParams.currentVertexBuffer[3 * currentID + 2].xyz;
bis.p[3] = pParams.currentVertexBuffer[3 * pParams.geometry.totalNumElements + currentID].xyz;
// Classify the element
ClassifyElement(currentID, bis, pParams.geometry.totalNumElements, pParams.geometry.baseDepth);
// Classify the element
ClassifyElement(currentID, bis, pParams.geometry.totalNumElements, pParams.geometry.baseDepth);
}
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
[numthreads(1, 1, 1)]
void Split(uint dispatchID : SV_DispatchThreadID)
{
if (dispatchID >= pParams.classificationBuffer[SPLIT_COUNTER])
if(dispatchID > 0)
return;
for(dispatchID = 0; dispatchID < pParams.classificationBuffer[SPLIT_COUNTER]; ++dispatchID)
{
//if (dispatchID >= pParams.classificationBuffer[SPLIT_COUNTER])
// return;
// Grab the real elementID
uint currentID = pParams.classificationBuffer[CLASSIFY_COUNTER_OFFSET + dispatchID];
// Grab the real elementID
uint currentID = pParams.classificationBuffer[CLASSIFY_COUNTER_OFFSET + dispatchID];
// Split the element
SplitElement(currentID, pParams.geometry.baseDepth);
// Split the element
SplitElement(currentID, pParams.geometry.baseDepth);
}
}
[numthreads(1, 1, 1)]
@@ -52,74 +62,102 @@ void PrepareIndirect(uint currentID : SV_DispatchThreadID)
pParams.indirectDispatchBuffer[currentID * 3 + 2] = 1;
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
[numthreads(1, 1, 1)]
void Allocate(uint groupIndex : SV_GroupIndex, uint dispatchID : SV_DispatchThreadID)
{
// Load the CBT to the LDS
load_buffer_to_shared_memory(groupIndex);
// If this element doesn't need to be processed, we're done
if (dispatchID >= pParams.allocateBuffer[0])
if(dispatchID > 0)
return;
// Allocate the required bits
AllocateElement(pParams.allocateBuffer[1 + dispatchID]);
for(uint i = 0; i < 64; ++i)
{
// Load the CBT to the LDS
load_buffer_to_shared_memory(i);
}
// If this element doesn't need to be processed, we're done
//if (dispatchID >= pParams.allocateBuffer[0])
// return;
for(uint i = 0; i < pParams.allocateBuffer[0]; ++i)
{
// Allocate the required bits
AllocateElement(pParams.allocateBuffer[1 + i]);
}
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
[numthreads(1, 1, 1)]
void Bisect(uint groupIndex : SV_GroupIndex, uint dispatchID : SV_DispatchThreadID)
{
// If this element doesn't need to be processed, we're done
if (dispatchID >= pParams.allocateBuffer[0])
if(dispatchID > 0)
return;
// Operation the bisection of this element
BisectElement(pParams.allocateBuffer[1 + dispatchID], dispatchID);
// If this element doesn't need to be processed, we're done
//if (dispatchID >= pParams.allocateBuffer[0])
// return;
for(uint i = 0; i < pParams.allocateBuffer[0]; ++i)
{
// Operation the bisection of this element
BisectElement(pParams.allocateBuffer[1 + i], i);
}
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
[numthreads(1, 1, 1)]
void PropagateBisect(uint dispatchID : SV_DispatchThreadID)
{
// If this element doesn't need to be processed, we're done
if (dispatchID >= pParams.propagateBuffer[0])
if(dispatchID > 0)
return;
PropagateBisectElement(pParams.propagateBuffer[2 + dispatchID]);
// If this element doesn't need to be processed, we're done
//if (dispatchID >= pParams.propagateBuffer[0])
// return;
for(uint i = 0; i < pParams.propagateBuffer[0]; ++i)
{
PropagateBisectElement(pParams.propagateBuffer[2 + i]);
}
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
[numthreads(1, 1, 1)]
void PrepareSimplify(uint dispatchID : SV_DispatchThreadID)
{
if(dispatchID > 0)
return;
// If this element doesn't need to be processed, we're done
if (dispatchID >= pParams.classificationBuffer[SIMPLIFY_COUNTER])
return;
//if (dispatchID >= pParams.classificationBuffer[SIMPLIFY_COUNTER])
// return;
for(uint i = 0; i < pParams.classificationBuffer[SIMPLIFY_COUNTER]; ++i)
{
// Grab the real elementID
uint currentID = pParams.classificationBuffer[CLASSIFY_COUNTER_OFFSET + pParams.geometry.totalNumElements + i];
// Grab the real elementID
uint currentID = pParams.classificationBuffer[CLASSIFY_COUNTER_OFFSET + pParams.geometry.totalNumElements + dispatchID];
// Simplify an element
PrepareSimplifyElement(currentID);
// Simplify an element
PrepareSimplifyElement(currentID);
}
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
void Simplify(uint currentID : SV_DispatchThreadID)
[numthreads(1, 1, 1)]
void Simplify(uint dispatchID : SV_DispatchThreadID)
{
// This thread doesn't have any work to do, we're done
if (currentID >= pParams.simplifyBuffer[0])
if(dispatchID > 0)
return;
// Simplify an element
SimplifyElement(pParams.simplifyBuffer[1 + currentID]);
// This thread doesn't have any work to do, we're done
//if (currentID >= pParams.simplifyBuffer[0])
// return;
for(uint i = 0; i < pParams.simplifyBuffer[0]; ++i)
{
// Simplify an element
SimplifyElement(pParams.simplifyBuffer[1 + i]);
}
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
[numthreads(1, 1, 1)]
void PropagateSimplify(uint dispatchID : SV_DispatchThreadID)
{
// If this element doesn't need to be processed, we're done
if (dispatchID >= pParams.propagateBuffer[1])
if(dispatchID > 0)
return;
PropagateElementSimplify(pParams.propagateBuffer[2 + dispatchID]);
// If this element doesn't need to be processed, we're done
//if (dispatchID >= pParams.propagateBuffer[1])
// return;
for(uint i = 0; i < pParams.propagateBuffer[1]; ++i)
{
PropagateElementSimplify(pParams.propagateBuffer[2 + i]);
}
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
@@ -142,15 +180,20 @@ void ReduceSecondPass(uint groupIndex : SV_GroupIndex)
reduce_second_pass(groupIndex);
}
[numthreads(WORKGROUP_SIZE, 1, 1)]
[numthreads(1, 1, 1)]
void BisectorIndexation(uint currentID : SV_DispatchThreadID)
{
// This thread doesn't have any work to do, we're done
if (currentID >= pParams.geometry.totalNumElements)
if(currentID > 0)
return;
// This thread doesn't have any work to do, we're done
//if (currentID >= pParams.geometry.totalNumElements)
// return;
// Indexate this bisector
BisectorElementIndexation(currentID);
for(uint i = 0; i < pParams.geometry.totalNumElements; ++i)
{
// Indexate this bisector
BisectorElementIndexation(i);
}
}
[numthreads(1, 1, 1)]