This commit is contained in:
mcrcortex
2024-09-24 10:40:51 +10:00
parent 00cf0c73e3
commit 10391c48c7
3 changed files with 6 additions and 6 deletions

View File

@@ -106,17 +106,17 @@ public class HierarchicalOcclusionTraverser {
MemoryUtil.memPutInt(ptr, sy); ptr += 4; MemoryUtil.memPutInt(ptr, sy); ptr += 4;
MemoryUtil.memPutInt(ptr, sz); ptr += 4; MemoryUtil.memPutInt(ptr, sz); ptr += 4;
MemoryUtil.memPutInt(ptr, viewport.width); ptr += 4; MemoryUtil.memPutFloat(ptr, viewport.width); ptr += 4;
var innerTranslation = new Vector3f((float) (viewport.cameraX-(sx<<5)), (float) (viewport.cameraY-(sy<<5)), (float) (viewport.cameraZ-(sz<<5))); var innerTranslation = new Vector3f((float) (viewport.cameraX-(sx<<5)), (float) (viewport.cameraY-(sy<<5)), (float) (viewport.cameraZ-(sz<<5)));
innerTranslation.getToAddress(ptr); ptr += 4*3; innerTranslation.getToAddress(ptr); ptr += 4*3;
MemoryUtil.memPutInt(ptr, viewport.height); ptr += 4; MemoryUtil.memPutFloat(ptr, viewport.height); ptr += 4;
MemoryUtil.memPutInt(ptr, (int) (this.renderList.size()/4-1)); ptr += 4; MemoryUtil.memPutInt(ptr, (int) (this.renderList.size()/4-1)); ptr += 4;
//Screen space size for descending //Screen space size for descending
MemoryUtil.memPutFloat(ptr, 128*128); ptr += 4; MemoryUtil.memPutFloat(ptr, 150*150); ptr += 4;
} }
private void bindings() { private void bindings() {

View File

@@ -82,7 +82,7 @@ bool isCulledByHiz() {
if (minBB.z < 0) {//Minpoint is behind the camera, its always going to pass if (minBB.z < 0) {//Minpoint is behind the camera, its always going to pass
return false; return false;
} }
vec2 ssize = size.xy * vec2(ivec2(screenW, screenH)); vec2 ssize = size.xy * vec2(screenW, screenH);
float miplevel = ceil(log2(max(max(ssize.x, ssize.y),1))); float miplevel = ceil(log2(max(max(ssize.x, ssize.y),1)));
vec2 midpoint = (maxBB.xy + minBB.xy)*0.5f; vec2 midpoint = (maxBB.xy + minBB.xy)*0.5f;
// printf("HiZ sample point culled: (%f,%f)@%f against %f", midpoint.x, midpoint.y, miplevel, minBB.z); // printf("HiZ sample point culled: (%f,%f)@%f against %f", midpoint.x, midpoint.y, miplevel, minBB.z);

View File

@@ -8,9 +8,9 @@ layout(local_size_x=LOCAL_SIZE) in;//, local_size_y=1
layout(binding = SCENE_UNIFORM_BINDING, std140) uniform SceneUniform { layout(binding = SCENE_UNIFORM_BINDING, std140) uniform SceneUniform {
mat4 VP; mat4 VP;
ivec3 camSecPos; ivec3 camSecPos;
uint screenW; float screenW;
vec3 camSubSecPos; vec3 camSubSecPos;
uint screenH; float screenH;
uint renderQueueMaxSize; uint renderQueueMaxSize;
float minSSS; float minSSS;
}; };