Cleared out arrayStride mess

Author: Crisspl

include/nbl/asset/ShaderRes.h

@@ -108,14 +108,14 @@ struct SShaderMemoryBlock
 
     struct SMember
     {
-        //! count==1 implies not array
         union {
             uint32_t count;
             uint32_t count_specID;
         };
         bool countIsSpecConstant;
         uint32_t offset;
         uint32_t size;
+        //! relevant only in case of array types
         uint32_t arrayStride;
         //! mtxStride==0 implies not matrix
         uint32_t mtxStride;
@@ -131,6 +131,8 @@ struct SShaderMemoryBlock
             size_t count;
         } members;
         std::string name;
+
+        bool isArray() const { return countIsSpecConstant || count > 1u; }
     };
 
     SMember::SMembers members;

src/nbl/asset/CShaderIntrospector.cpp

@@ -684,7 +684,10 @@ static void introspectStructType(spirv_cross::Compiler& _comp, impl::SShaderMemo
         member.offset = _baseOffset + _comp.type_struct_member_offset(_parentType, m);
         member.rowMajor = _comp.get_member_decoration(_parentType.self, m, spv::DecorationRowMajor);
         member.type = spvcrossType2E_TYPE(mtype.basetype);
+        member.arrayStride = 0u;
 
+        // if array, then we can get array stride from decoration (via spirv-cross)
+        // otherwise arrayStride is left with value 0
         if (mtype.array.size())
         {
             member.count = mtype.array[0];
@@ -698,10 +701,6 @@ static void introspectStructType(spirv_cross::Compiler& _comp, impl::SShaderMemo
                 member.count_specID = sc->id;
             }
         }
-        else if (mtype.columns > 1u)
-            member.arrayStride = member.size;
-		else if (mtype.basetype != spirv_cross::SPIRType::Struct)
-			member.arrayStride = core::max(0x1u<<core::findMSB(member.size),16u);
 
         if (mtype.basetype == spirv_cross::SPIRType::Struct) //recursive introspection done in DFS manner (and without recursive calls)
             _pushStack.push({member.members, mtype, member.offset});

src/nbl/video/IOpenGLPipeline.h

@@ -73,15 +73,18 @@ class IOpenGLPipeline
 
 		        uint8_t* valueptr = state+m.offset;
 
-                uint32_t arrayStride = 0u; // TODO: @Crisspl this calculation is 100% wrong with `row_major` and arrays of matrices (for both std140 and std430)
+                uint32_t arrayStride = m.arrayStride;
+                // in case of non-array types, m.arrayStride is irrelevant
+                // we should compute it though, so that we dont have to branch in the loop 
+                if (!m.isArray())
                 {
-                    uint32_t arrayStride1 = 0u;
+                    // 1N for scalar types, 2N for gvec2, 4N for gvec3 and gvec4
+                    // N==sizeof(float)
                     if (is_scalar_or_vec())
-                        arrayStride1 = (m.mtxRowCnt==1u) ? m.size : core::roundUpToPoT(m.mtxRowCnt)*4u;
+                        arrayStride = (m.mtxRowCnt==1u) ? m.size : core::roundUpToPoT(m.mtxRowCnt)*sizeof(float);
+                    // same as size in case of matrices
                     else if (is_mtx())
-                        arrayStride1 = m.arrayStride;
-                    assert(arrayStride1);
-                    arrayStride = (m.count <= 1u) ? arrayStride1 : m.arrayStride;
+                        arrayStride = m.size;
                 }
 		        assert(m.mtxStride==0u || arrayStride%m.mtxStride==0u);
 		        NBL_ASSUME_ALIGNED(valueptr, sizeof(float));