spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes and tweeks for things

Browse Source
This commit is contained in:
mcrcortex
2025-03-24 13:49:15 +10:00
parent 8b7a3c4bb1
commit 68a17f0578
6 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/assets/voxy/shaders/lod/hierarchical/cleaner/result_transformer.comp
View File

@@ -22,7 +22,7 @@ void main() {
uint id = minVisIds[gl_LocalInvocationID.x];
uvec4 node = nodes[id];
uvec2 res = node.xy;
if (all(equal(node, uvec4(0)))) {//If its a empty node, TODO: DONT THINK THIS IS ACTUALLY CORRECT
if (all(equal(node, uvec4(-1)))) {//If its a empty node, TODO: DONT THINK THIS IS ACTUALLY CORRECT
res = uvec2(-1);
}
outputBuffer[gl_LocalInvocationID.x] = res;//Move the position of the node id into the output buffer
@@ -30,6 +30,6 @@ void main() {
//This is an evil hack to not spam the same node 500 times in a row
//TODO: maybe instead set this to the current frame index
// visibility[id] += 30;
visibility[id] = visibilityCounter;
visibility[id] = visibilityCounter + 60;
}

10
src/main/resources/assets/voxy/shaders/lod/hierarchical/cleaner/sort_visibility.comp
View File

@@ -18,7 +18,8 @@ layout(binding = OUTPUT_BUFFER_BINDING, std430) restrict volatile buffer Minimum
};
//Returns the id of the max value
uint atomicDerefMax(uint atId, uint id, uint value) {
uint atomicDerefMaxExchange(uint atId, uint id) {
const uint value = visiblity[id];
while (true) {
const uint existingId = minVisIds[atId];
//Check if the value is less than the dereferenced value, if its not, return our own id
@@ -26,7 +27,7 @@ uint atomicDerefMax(uint atId, uint id, uint value) {
return id;
}
//Attempt to swap, since we know we are less than the existingId
uint c = atomicCompSwap(minVisIds[atId], existingId, id);
const uint c = atomicCompSwap(minVisIds[atId], existingId, id);
//Check if we did swap, else if we failed (or got reswapped else where) recheck
//We did swap, (since the original mem contents was the existing id)
@@ -40,7 +41,7 @@ uint atomicDerefMax(uint atId, uint id, uint value) {
//TODO: optimize
void bubbleSort(uint start, uint id) {
for (uint i = start; i < OUTPUT_SIZE; i++) {
id = atomicDerefMax(i, id, visiblity[id]);
id = atomicDerefMaxExchange(i, id);
}
}
@@ -50,6 +51,9 @@ void main() {
//}
//First do a min sort/set of min OUTPUT_SIZE values of the set
uint vis = visiblity[gl_GlobalInvocationID.x];
if (vis == uint(-1)) {
return;
}
if (visiblity[minVisIds[OUTPUT_SIZE-1]] <= vis) {
return;
}