now compile MPV2 with SSBO

Author: devshgraphicsprogramming

examples_tests/41.VisibilityBuffer/main.cpp

@@ -80,7 +80,7 @@ struct BatchInstanceData
         struct
         {
             uint32_t invalid_0[3];
-            uint32_t baseTriangle;
+            uint32_t baseVertex;
         };
     };
     union
@@ -173,7 +173,7 @@ STextureData getTextureData(core::vector<commit_t>& _out_commits, const asset::I
     return addr;
 }
 
-constexpr bool useSSBO = false;
+constexpr bool useSSBO = true;
 
 int main()
 {
@@ -646,7 +646,10 @@ int main()
 
             uint32_t writeCount,infoCount;
             if constexpr (useSSBO)
-                writeCount = infoCount = gpump->getDescriptorSetWritesForSSBO(nullptr,nullptr,nullptr);
+            {
+                writeCount = gpump->getDescriptorSetWritesForSSBO(nullptr,nullptr,nullptr);
+                infoCount = 2u;
+            }
             else
                 std::tie(writeCount,infoCount) = gpump->getDescriptorSetWritesForUTB(nullptr,nullptr,nullptr);
             vector<IGPUDescriptorSet::SWriteDescriptorSet> writesVG(++writeCount);
@@ -722,6 +725,7 @@ int main()
                 SRasterizationParams{}
             );
         }
+#if 0
         {
             SPushConstantRange pcRange;
             pcRange.size = sizeof(core::vectorSIMDf); // TODO: send camera data
@@ -730,9 +734,10 @@ int main()
 
             sceneData.shadeVBufferPpln = driver->createGPUComputePipeline(
                 nullptr,driver->createGPUPipelineLayout(&pcRange,&pcRange+1,std::move(vtDSLayout),std::move(vgDSLayout),std::move(perFrameDSLayout),std::move(shadingDSLayout)),
-                overrideShaderJustAfterVersionDirective("shadeVBuffer.comp")
+                overrideShaderJustAfterVersionDirective("../shadeVBuffer.comp")
             );
         }
+#endif
     }
 
     //! we want to move around the scene and view it from different angles
@@ -784,13 +789,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

@@ -53,8 +53,6 @@ float nbl_glsl_VT_getVTexSzRcp()
 #define _NBL_USER_PROVIDED_VIRTUAL_TEXTURING_FUNCTIONS_
 
 
-vec4 nbl_glsl_vTextureGrad
-
 
 vec4 nbl_sample_Ka(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawGUID].map_Ka_data, uv, dUV); }
 

include/nbl/asset/utils/IMeshPackerV2.h

@@ -466,6 +466,7 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
             result += "#define _NBL_VG_SSBO_UVEC4_BINDING " + std::to_string(params.uvec4BufferBinding) + '\n';
         }
 
+        result += "#define _NBL_VG_USE_SSBO_INDEX\n";
         result += "#define _NBL_VG_SSBO_INDEX_BINDING " + std::to_string(params.indexBufferBinding) + '\n';
         return result;
     }
@@ -504,31 +505,28 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
         return bindingCount;
     }
 
+    // info count is always 2
     inline uint32_t getDescriptorSetWritesForSSBO(
         typename DescriptorSetType::SWriteDescriptorSet* outWrites, typename DescriptorSetType::SDescriptorInfo* outInfo, DescriptorSetType* dstSet,
         const DSLayoutParamsSSBO& params = {}
     ) const
     {
-        const uint32_t writeAndInfoCount = getDSlayoutBindingsForSSBO(nullptr);
+        const uint32_t writeCount = getDSlayoutBindingsForSSBO(nullptr);
         if (!outWrites || !outInfo)
-            return writeAndInfoCount;
-
-        outInfo->desc = vtxBuffer;
-        outInfo->buffer.offset = 0u;
-        outInfo->buffer.size = m_packerDataStore.vertexBuffer->getSize();
+            return writeCount;
 
         auto* write = outWrites;
+        auto info = outInfo;
         auto fillWriteStruct = [&](uint32_t binding)
         {
             write->binding = binding;
             write->arrayElement = 0u;
             write->count = 1u;
             write->descriptorType = EDT_STORAGE_BUFFER;
             write->dstSet = dstSet;
-            write->info = outInfo;
+            write->info = info;
             write++;
         };
-
         if (m_virtualAttribConfig.isUintBufferUsed)
             fillWriteStruct(params.uintBufferBinding);
         if (m_virtualAttribConfig.isUvec2BufferUsed)
@@ -537,8 +535,18 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
             fillWriteStruct(params.uvec3BufferBinding);
         if (m_virtualAttribConfig.isUvec4BufferUsed)
             fillWriteStruct(params.uvec4BufferBinding);
+        info->desc = m_packerDataStore.vertexBuffer;
+        info->buffer.offset = 0u;
+        info->buffer.size = m_packerDataStore.vertexBuffer->getSize();
+        info++;
+        
+        fillWriteStruct(params.indexBufferBinding);
+        info->desc = m_packerDataStore.indexBuffer;
+        info->buffer.offset = 0u;
+        info->buffer.size = m_packerDataStore.indexBuffer->getSize();
+        info++;
 
-        return writeAndInfoCount;
+        return writeCount;
     }
 
 	template <typename MeshBufferIterator>

include/nbl/builtin/glsl/barycentric/frag.glsl

@@ -29,8 +29,8 @@ vec2 nbl_glsl_barycentric_frag_get();
 #define NBL_GLSL_BARYCENTRIC_FRAG_POS_INPUT
 #ifndef NBL_GLSL_BARYCENTRIC_FRAG_POS_INPUT_LOC
 #define NBL_GLSL_BARYCENTRIC_FRAG_POS_INPUT_LOC 0
-layout(location = NBL_GLSL_BARYCENTRIC_FRAG_POS_INPUT_LOC) in vec3 nbl_glsl_barycentric_frag_pos;
 #endif
+layout(location = NBL_GLSL_BARYCENTRIC_FRAG_POS_INPUT_LOC) in vec3 nbl_glsl_barycentric_frag_pos;
 #endif
 #ifndef NBL_GLSL_BARYCENTRIC_FRAG_PROVOKINGPOS_INPUT
 #define NBL_GLSL_BARYCENTRIC_FRAG_PROVOKINGPOS_INPUT