new concepts for the vbuffer shader

Author: devshgraphicsprogramming

examples_tests/41.VisibilityBuffer/common.glsl

@@ -1,6 +1,8 @@
 #ifndef _COMMON_GLSL_INCLUDED_
 #define _COMMON_GLSL_INCLUDED_
 
+#extension GL_EXT_shader_16bit_storage: require
+
 #include "common.h"
 
 // defines for buffer fill pipeline
@@ -13,7 +15,7 @@
 struct BatchInstanceData
 {
     vec3 Ka;
-    uint baseVertex;
+    uint baseTriangle;
     vec3 Kd;
     nbl_glsl_VG_VirtualAttributePacked_t vAttrPos;
     vec3 Ks;
@@ -36,13 +38,6 @@ layout(set = 1, binding = 0, std430) readonly buffer BatchInstanceBuffer
 {
     BatchInstanceData batchInstanceData[];
 };
-#if 0
-// VG
-layout(set = 1, binding = 1, std430) readonly buffer IndexBuffer // TODO: VG descriptor include
-{
-    uint indexBuffer[];
-};
-#endif
 
 // non-global descriptors
 #include <nbl/builtin/glsl/utils/common.glsl>

examples_tests/41.VisibilityBuffer/fillVBuffer.frag

@@ -1,21 +1,25 @@
 #version 430 core
 
-layout(location = 0) flat in uint drawID;
-
 #include "common.glsl"
 
+layout(location = 0) flat in uint drawGUID;
+
 // TODO: investigate using snorm16 for the derivatives
 layout(location = 0) out uvec4 triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2; // 32bit triangleID, 2x16bit barycentrics, 4x16bit barycentric derivatives 
 #include <nbl/builtin/glsl/barycentric/frag.glsl>
 
-uint nbl_glsl_barycentric_frag_getDrawID() {return drawID;}
-vec3 nbl_glsl_barycentric_frag_getVertexPos(in uint drawID, in uint primID, in uint primsVx) {return vec3(0.0/0.0);} // TODO
+uint nbl_glsl_barycentric_frag_getDrawID() {return drawGUID;}
+vec3 nbl_glsl_barycentric_frag_getVertexPos(in uint drawID, in uint primID, in uint primsVx)
+{
+    const uvec3 tri = nbl_glsl_VG_fetchTriangle(primID+batchInstanceData[drawID].baseTriangle); // can optimize, preload only the y,z component
+    return nbl_glsl_fetchVtxPos(tri[primsVx],drawID);
+}
 
 void main()
 {
     vec2 bary = nbl_glsl_barycentric_frag_get();
 
-    triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[0] = bitfieldInsert(gl_PrimitiveID,drawID,MAX_TRIANGLES_IN_BATCH,32-MAX_TRIANGLES_IN_BATCH);
+    triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[0] = bitfieldInsert(gl_PrimitiveID,drawGUID,MAX_TRIANGLES_IN_BATCH,32-MAX_TRIANGLES_IN_BATCH);
     triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[1] = packUnorm2x16(bary);
     triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[2] = packHalf2x16(dFdx(bary));
     triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[3] = packHalf2x16(dFdy(bary));

examples_tests/41.VisibilityBuffer/shadeVBuffer.comp

@@ -85,7 +85,6 @@ mat2 nbl_glsl_perturbNormal_dUVdSomething()
 #include <nbl/builtin/glsl/colorspace/OETF.glsl>
 void main()
 {
-    // TODO: out of bounds check and return
     const ivec2 fragCoord = ivec2(gl_GlobalInvocationID);
     if (any(greaterThanEqual(fragCoord,textureSize(vBuffer,0))))
         return;
@@ -101,8 +100,7 @@ void main()
     );
 
     gBatchInstance = batchInstanceData[drawID];
-    const uint indexOffset = triangleID*3u+batchInstanceData.baseVertex;
-    const uint vertexIDs[3] = {indexBuffer[indexOffset+0u],indexBuffer[indexOffset+1u],indexBuffer[indexOffset+2u]};
+    const uvec3 vertexIDs = nbl_glsl_VG_fetchTriangle(triangleID+gBatchInstance.baseTriangle);
 
     vec3 pos,normal;
     vec2 uv;