everything works, made a nice mode for debugging cluster groups for @Przemog1

Author: devshgraphicsprogramming

examples_tests/41.VisibilityBuffer/main.cpp

@@ -20,14 +20,9 @@ using namespace nbl::video;
 //vt stuff
 using STextureData = asset::ICPUVirtualTexture::SMasterTextureData;
 
-constexpr uint32_t PAGE_SZ_LOG2 = 7u;
 constexpr uint32_t TILES_PER_DIM_LOG2 = 4u;
-constexpr uint32_t PAGE_PADDING = 8u;
 constexpr uint32_t MAX_ALLOCATABLE_TEX_SZ_LOG2 = 12u; //4096
 
-constexpr uint32_t PGTAB_BINDING = 0u;
-constexpr uint32_t PHYSICAL_STORAGE_VIEWS_BINDING = 1u;
-
 struct commit_t
 {
     STextureData addr;
@@ -567,7 +562,7 @@ int main()
             auto binding_and_sampler_count = gpuvt->getDSlayoutBindings(nullptr,nullptr);
             core::vector<IGPUDescriptorSetLayout::SBinding> vtBindings(binding_and_sampler_count.first);
             core::vector<smart_refctd_ptr<IGPUSampler>> vtSamplers(binding_and_sampler_count.second);
-            gpuvt->getDSlayoutBindings(vtBindings.data(),vtSamplers.data(),PGTAB_BINDING,PHYSICAL_STORAGE_VIEWS_BINDING);
+            gpuvt->getDSlayoutBindings(vtBindings.data(),vtSamplers.data(),_NBL_VT_PAGE_TABLE_BINDING,_NBL_VT_FLOAT_VIEWS_BINDING);
             auto& precomputedBinding = vtBindings.emplace_back();
             precomputedBinding.binding = 2u;
             precomputedBinding.type = EDT_STORAGE_BUFFER;
@@ -584,7 +579,7 @@ int main()
             const auto sizesVT = gpuvt->getDescriptorSetWrites(nullptr,nullptr,nullptr);
             core::vector<video::IGPUDescriptorSet::SWriteDescriptorSet> writesVT(sizesVT.first+1u);
             core::vector<video::IGPUDescriptorSet::SDescriptorInfo> infoVT(sizesVT.second+1u);
-            gpuvt->getDescriptorSetWrites(writesVT.data(),infoVT.data(),sceneData.vtDS.get(),PGTAB_BINDING,PHYSICAL_STORAGE_VIEWS_BINDING);
+            gpuvt->getDescriptorSetWrites(writesVT.data(),infoVT.data(),sceneData.vtDS.get(),_NBL_VT_PAGE_TABLE_BINDING,_NBL_VT_FLOAT_VIEWS_BINDING);
 
             auto& precomp = gpuvt->getPrecomputedData();
             infoVT.back().desc = driver->createFilledDeviceLocalGPUBufferOnDedMem(sizeof(precomp),&precomp);
@@ -674,8 +669,7 @@ int main()
             }
             driver->updateDescriptorSets(writeCount,writesVG.data(),0u,nullptr);
         }(tmp);
-        // TODO: sprintf(fragPrelude.data(), FRAGMENT_SHADER_OVERRIDES, sceneData.vt->getFloatViews().size(), sceneData.vt->getGLSLFunctionsIncludePath().c_str());
-        auto overrideShaderJustAfterVersionDirective = [am,driver,extraCode](const char* path)
+        auto overrideShaderJustAfterVersionDirective = [am,driver,&extraCode](const char* path)
         {
             asset::IAssetLoader::SAssetLoadParams lp;
             auto _specShader = IAsset::castDown<ICPUSpecializedShader>(*am->getAsset(path,lp).getContents().begin());
@@ -722,8 +716,10 @@ int main()
                 SRasterizationParams{}
             );
         }
-#if 0
         {
+            extraCode += "#define _NBL_VT_FLOAT_VIEWS_COUNT "+std::to_string(gpuvt->getFloatViews().size())+"\n";
+            std::cout << gpuvt->getGLSLFunctionsIncludePath().c_str() << std::endl;
+
             SPushConstantRange pcRange;
             pcRange.size = sizeof(core::vectorSIMDf); // TODO: send camera data
             pcRange.offset = 0u;
@@ -734,7 +730,6 @@ int main()
                 overrideShaderJustAfterVersionDirective("../shadeVBuffer.comp")
             );
         }
-#endif
     }
 
     //! we want to move around the scene and view it from different angles
@@ -786,13 +781,13 @@ int main()
                 sizeof(DrawElementsIndirectCommand_t)
             );
         }
-#if 0
+
         // shade
         driver->bindDescriptorSets(video::EPBP_COMPUTE,sceneData.shadeVBufferPpln->getLayout(),0u,4u,ds,nullptr);
         driver->bindComputePipeline(sceneData.shadeVBufferPpln.get());
         driver->dispatch((params.WindowSize.Width-1u)/SHADING_WG_SIZE_X+1u,(params.WindowSize.Height-1u)/SHADING_WG_SIZE_Y+1u,1u);
         COpenGLExtensionHandler::extGlMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT);
-#endif
+
         // blit
         driver->blitRenderTargets(fb,0);
         driver->endScene();

examples_tests/41.VisibilityBuffer/shadeVBuffer.comp

@@ -1,9 +1,16 @@
 #version 430 core
 
+#line 4 // so we get good line numbers for errors
 #include "common.glsl"
 layout (local_size_x = SHADING_WG_SIZE_X, local_size_y = SHADING_WG_SIZE_Y) in;
 
 #include <nbl/builtin/glsl/virtual_texturing/extensions.glsl>
+#define _NBL_VT_DESCRIPTOR_SET 0
+#define _NBL_VT_FLOAT_VIEWS
+#define _NBL_VT_INT_VIEWS_COUNT 0
+#define _NBL_VT_INT_VIEWS
+#define _NBL_VT_UINT_VIEWS_COUNT 0
+#define _NBL_VT_UINT_VIEWS
 #include <nbl/builtin/glsl/virtual_texturing/descriptors.glsl>
 layout (set = 0, binding = 2, std430) restrict readonly buffer PrecomputedStuffSSBO
 {
@@ -13,7 +20,7 @@ layout (set = 0, binding = 2, std430) restrict readonly buffer PrecomputedStuffS
     uint layer_to_sampler_ix[_NBL_VT_MAX_PAGE_TABLE_LAYERS];
 } precomputed;
 
-layout(set = 3, binding = 0) uniform sampler2D vBuffer;
+layout(set = 3, binding = 0) uniform usampler2D vBuffer;
 layout(set = 3, binding = 1, rgba8) uniform image2D frameBuffer;
 
 #include <nbl/builtin/glsl/loader/mtl/common.glsl>
@@ -51,21 +58,22 @@ float nbl_glsl_VT_getVTexSzRcp()
     return precomputed.vtex_sz_rcp;
 }
 #define _NBL_USER_PROVIDED_VIRTUAL_TEXTURING_FUNCTIONS_
+#if PAGE_SZ_LOG2!=7||PAGE_PADDING!=8
+    #error "Adjust the include path for the VT functions!"
+#endif
+#include <nbl/builtin/glsl/virtual_texturing/functions.glsl/7/8>
 
 
+#define _NBL_FRAG_SET3_BINDINGS_DEFINED_
+#define _NBL_FRAG_PUSH_CONSTANTS_DEFINED_
 
-vec4 nbl_sample_Ka(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawGUID].map_Ka_data, uv, dUV); }
-
-vec4 nbl_sample_Kd(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawGUID].map_Kd_data, uv, dUV); }
-
-vec4 nbl_sample_Ks(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawGUID].map_Ks_data, uv, dUV); }
-
-vec4 nbl_sample_Ns(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawGUID].map_Ns_data, uv, dUV); }
-
-vec4 nbl_sample_d(in vec2 uv, in mat2 dUV)    { return nbl_glsl_vTextureGrad(materialData[drawGUID].map_d_data, uv, dUV); }
-
-vec4 nbl_sample_bump(in vec2 uv, in mat2 dUV) { return nbl_glsl_vTextureGrad(materialData[drawGUID].map_bump_data, uv, dUV); }
-
+vec4 nbl_sample_Ka(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(gBatchInstance.map_Ka_data, uv, dUV); }
+vec4 nbl_sample_Kd(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(gBatchInstance.map_Kd_data, uv, dUV); }
+vec4 nbl_sample_Ks(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(gBatchInstance.map_Ks_data, uv, dUV); }
+vec4 nbl_sample_Ns(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(gBatchInstance.map_Ns_data, uv, dUV); }
+vec4 nbl_sample_d(in vec2 uv, in mat2 dUV)    { return nbl_glsl_vTextureGrad(gBatchInstance.map_d_data, uv, dUV); }
+vec4 nbl_sample_bump(in vec2 uv, in mat2 dUV) { return nbl_glsl_vTextureGrad(gBatchInstance.map_bump_data, uv, dUV); }
+#define _NBL_TEXTURE_SAMPLE_FUNCTIONS_DEFINED_
 
 
 mat2x3 dPdBary;
@@ -80,7 +88,14 @@ mat2 nbl_glsl_perturbNormal_dUVdSomething()
 }
 #define _NBL_BUILTIN_GLSL_BUMP_MAPPING_DERIVATIVES_DECLARED_
 
+
 #include <nbl/builtin/glsl/colorspace/OETF.glsl>
+
+vec3 uintIDToColor(uint id)
+{
+    return vec3(bitfieldExtract(id,0,4),bitfieldExtract(id,4,4),bitfieldExtract(id,8,4))/15.0;
+}
+
 void main()
 {
     const ivec2 fragCoord = ivec2(gl_GlobalInvocationID);
@@ -89,19 +104,20 @@ void main()
 
     const uvec4 triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2 = texelFetch(vBuffer,fragCoord,0);
 
-    const uint drawGUID = bitfieldExtract(triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[0],MAX_TRIANGLES_IN_BATCH,32-MAX_TRIANGLES_IN_BATCH);
-    const uint triangleID = bitfieldExtract(triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[0],0,MAX_TRIANGLES_IN_BATCH);
+    const int triangleIDBitcount = findMSB(MAX_TRIANGLES_IN_BATCH-1)+1;
+    const uint drawGUID = bitfieldExtract(triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[0],triangleIDBitcount,32-triangleIDBitcount);
+    const uint triangleID = bitfieldExtract(triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[0],0,triangleIDBitcount);
     const vec2 bary = unpackUnorm2x16(triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[1]);
     const mat2 dBary = mat2(
         unpackHalf2x16(triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[2]),
         unpackHalf2x16(triangleIDdrawID_unorm16Bary_dBarydScreenHalf2x2[3])
     );
 
-    gBatchInstance = batchInstanceData[drawID];
+    gBatchInstance = batchInstanceData[drawGUID];
     uvec3 vertexIDs;
     const uint baseTriangleVertex = triangleID*3u+gBatchInstance.firstIndex;
     for (uint i=0u; i<3u; i++)
-        vertexIDs[i] = nbl_glsl_VG_fetchTriangleVertexIndex(baseTriangleVertex,i)
+        vertexIDs[i] = nbl_glsl_VG_fetchTriangleVertexIndex(baseTriangleVertex,i);
 
     vec3 pos,normal;
     vec2 uv;
@@ -130,12 +146,17 @@ void main()
         const float lastBary = 1.f-bary.x-bary.y;
 
 
-        normal = nbl_glsl_fetchVtxNormal(vertices[0],drawGUID)*bary.x;
-        normal += nbl_glsl_fetchVtxNormal(vertices[1],drawGUID)*bary.y;
-        normal += nbl_glsl_fetchVtxNormal(vertices[2],drawGUID)*lastBary;
+        normal = nbl_glsl_fetchVtxNormal(vertexIDs[0],drawGUID)*bary.x;
+        normal += nbl_glsl_fetchVtxNormal(vertexIDs[1],drawGUID)*bary.y;
+        normal += nbl_glsl_fetchVtxNormal(vertexIDs[2],drawGUID)*lastBary;
     }
 
     vec4 color; // TODO: shading
 
+    color = vec4(0,0,0,1);
+    color.rgb = uintIDToColor(drawGUID);
+    //color.rgb = 0.5*normal+vec3(0.5);
+    //color.rgb = ;
+
     imageStore(frameBuffer,fragCoord,vec4(nbl_glsl_oetf_sRGB(color.rgb),color.a));
 }