Getting blocked by google/shaderc#1205

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/fillVisBuffer.frag

@@ -2,8 +2,8 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 #version 430 core
+#extension GL_NV_fragment_shader_barycentric : require
 #extension GL_EXT_shader_16bit_storage : require
-#include <nbl/builtin/glsl/barycentric/extensions.glsl>
 
 
 #define _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_BINDING_ 0

include/nbl/asset/utils/CCPUMeshPackerV1.h

@@ -32,21 +32,12 @@ class CCPUMeshPackerV1 final : public IMeshPacker<ICPUMeshBuffer, MDIStructType>
 		size_t perInstanceVertexBufferMinAllocByteSize = 32ull;
 	};
 
-	struct ReservedAllocationMeshBuffers
+	struct ReservedAllocationMeshBuffers : ReservedAllocationMeshBuffersBase
 	{
-		uint32_t mdiAllocationOffset;
-		uint32_t mdiAllocationReservedCnt;
 		uint32_t instanceAllocationOffset;
 		uint32_t instanceAllocationReservedSize;
-		uint32_t indexAllocationOffset;
-		uint32_t indexAllocationReservedCnt;
 		uint32_t vertexAllocationOffset;
 		uint32_t vertexAllocationReservedSize;
-
-		inline bool isValid() const
-		{
-			return this->mdiAllocationOffset != core::GeneralpurposeAddressAllocator<uint32_t>::invalid_address;
-		}
 	};
 
 	struct PackerDataStore : base_t::template PackerDataStoreCommon<ICPUBuffer>
@@ -78,17 +69,13 @@ class CCPUMeshPackerV1 final : public IMeshPacker<ICPUMeshBuffer, MDIStructType>
 
 	void free(const ReservedAllocationMeshBuffers& ramb)
 	{
-		if (ramb.indexAllocationOffset != INVALID_ADDRESS)
-			m_idxBuffAlctr.free_addr(ramb.indexAllocationOffset, ramb.indexAllocationReservedCnt);
-
-		if (ramb.mdiAllocationOffset != INVALID_ADDRESS)
-			m_MDIDataAlctr.free_addr(ramb.mdiAllocationOffset, ramb.mdiAllocationReservedCnt);
-
 		if (ramb.vertexAllocationOffset != INVALID_ADDRESS)
 			m_vtxBuffAlctr.free_addr(ramb.vertexAllocationOffset, ramb.vertexAllocationReservedSize);
 
 		if (ramb.instanceAllocationOffset != INVALID_ADDRESS)
 			m_vtxBuffAlctr.free_addr(ramb.instanceAllocationOffset, ramb.instanceAllocationReservedSize);
+
+		base_t::free(ramb);
 	}
 
 	//needs to be called before first `commit`

include/nbl/asset/utils/IMeshPacker.h

@@ -16,7 +16,19 @@ class IMeshPackerBase : public virtual core::IReferenceCounted
 {
     public:
         constexpr static uint32_t MAX_TRIANGLES_IN_BATCH_CNT = 21845u;
+        
+        struct ReservedAllocationMeshBuffersBase
+        {
+            uint32_t mdiAllocationOffset;
+            uint32_t mdiAllocationReservedCnt;
+            uint32_t indexAllocationOffset;
+            uint32_t indexAllocationReservedCnt;
 
+            inline bool isValid()
+            {
+                return this->mdiAllocationOffset!=core::GeneralpurposeAddressAllocator<uint32_t>::invalid_address;
+            }
+        };
         struct PackedMeshBufferData
         {
             uint32_t mdiParameterOffset; // add to `CCPUMeshPacker::getMultiDrawIndirectBuffer()->getPointer() to get `DrawElementsIndirectCommand_t` address
@@ -120,7 +132,18 @@ class IMeshPackerBase : public virtual core::IReferenceCounted
             m_vtxBuffAlctr = core::GeneralpurposeAddressAllocator<uint32_t>(alctrBuffSz, vtxAlctr, resSpcTmp);
         }
 
-    protected:
+        void free(const ReservedAllocationMeshBuffersBase& rambb)
+        {
+            if (rambb.indexAllocationOffset != INVALID_ADDRESS)
+                m_idxBuffAlctr.free_addr(rambb.indexAllocationOffset,rambb.indexAllocationReservedCnt);
+
+            if (rambb.mdiAllocationOffset != INVALID_ADDRESS)
+                m_MDIDataAlctr.free_addr(rambb.mdiAllocationOffset,rambb.mdiAllocationReservedCnt);
+        }
+        
+        //
+        _NBL_STATIC_INLINE_CONSTEXPR uint32_t INVALID_ADDRESS = core::GeneralpurposeAddressAllocator<uint32_t>::invalid_address;
+
         core::GeneralpurposeAddressAllocator<uint32_t> m_vtxBuffAlctr;
         core::GeneralpurposeAddressAllocator<uint32_t> m_idxBuffAlctr;
         core::GeneralpurposeAddressAllocator<uint32_t> m_MDIDataAlctr;
@@ -602,8 +625,6 @@ class IMeshPacker : public IMeshPackerBase
         }
     };
 
-    _NBL_STATIC_INLINE_CONSTEXPR uint32_t INVALID_ADDRESS = core::GeneralpurposeAddressAllocator<uint32_t>::invalid_address;
-
 };
 
 }

include/nbl/asset/utils/IMeshPackerV2.h

@@ -293,18 +293,9 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
 
     //TODO: REDESIGN
     //mdi allocation offset and index allocation offset should be shared
-    struct ReservedAllocationMeshBuffers
+    struct ReservedAllocationMeshBuffers : ReservedAllocationMeshBuffersBase
     {
-        uint32_t mdiAllocationOffset;
-        uint32_t mdiAllocationReservedCnt;
-        uint32_t indexAllocationOffset;
-        uint32_t indexAllocationReservedCnt;
         AttribAllocParams attribAllocParams[SVertexInputParams::MAX_VERTEX_ATTRIB_COUNT];
-
-        inline bool isValid()
-        {
-            return this->mdiAllocationOffset!=core::GeneralpurposeAddressAllocator<uint32_t>::invalid_address;
-        }
     };
     struct VirtualAttribute
     {
@@ -595,17 +586,13 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
     {
         for (uint32_t i = 0u; i < meshBuffersToFreeCnt; i++)
         {
-            const ReservedAllocationMeshBuffers* const ramb = rambIn + i;
+            const ReservedAllocationMeshBuffers& ramb = rambIn[i];
 
-            if (ramb->indexAllocationOffset != INVALID_ADDRESS)
-                m_idxBuffAlctr.free_addr(ramb->indexAllocationOffset, ramb->indexAllocationReservedCnt);
-            
-            if (ramb->mdiAllocationOffset != INVALID_ADDRESS)
-                m_MDIDataAlctr.free_addr(ramb->mdiAllocationOffset, ramb->mdiAllocationReservedCnt);
+            base_t::free(ramb);
 
             for (uint32_t j = 0; j < SVertexInputParams::MAX_VERTEX_ATTRIB_COUNT; j++)
             {
-                const AttribAllocParams& attrAllocParams = ramb->attribAllocParams[j];
+                const AttribAllocParams& attrAllocParams = ramb.attribAllocParams[j];
                 if (attrAllocParams.offset != INVALID_ADDRESS)
                     m_vtxBuffAlctr.free_addr(attrAllocParams.offset, attrAllocParams.size);
             }