Fixed bugs 3,5,6

Author: Crisspl

examples_tests/22.RaytracedAO/dirty_source/ExtraCrap.cpp

@@ -21,7 +21,7 @@ constexpr uint32_t kOptiXPixelSize = sizeof(uint16_t)*3u;
 core::smart_refctd_ptr<ICPUSpecializedShader> specializedShaderFromFile(IAssetManager* assetManager, const char* path)
 {
 	auto bundle = assetManager->getAsset(path, {});
-	return core::move_and_static_cast<ICPUSpecializedShader>(*bundle.getContents().begin());
+	return core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(*bundle.getContents().begin());
 }
 core::smart_refctd_ptr<IGPUSpecializedShader> gpuSpecializedShaderFromFile(IAssetManager* assetManager, IVideoDriver* driver, const char* path)
 {

include/nbl/asset/IVirtualTexture.h

@@ -319,9 +319,11 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
         assert(_pgTabSzxy_log2<=MAX_PAGE_TABLE_EXTENT_LOG2);//otherwise STextureData encoding falls apart
         assert(_pgTabLayers<=MAX_PAGE_TABLE_LAYERS);
 
+        _pgTabLayers = std::max(_pgTabLayers, 1u);
+
         const uint32_t pgTabSzxy = 1u<<_pgTabSzxy_log2;
         typename image_t::SCreationParams params;
-        params.arrayLayers = std::max(_pgTabLayers, 1u); // page table must always be present
+        params.arrayLayers = _pgTabLayers; // page table must always be present
         params.extent = {pgTabSzxy,pgTabSzxy,1u};
         params.format = EF_R16G16_UINT;
         params.mipLevels = std::max<int32_t>(static_cast<int32_t>(_maxAllocatableTexSz_log2-_pgSzxy_log2+1u), 1);

include/nbl/builtin/glsl/material_compiler/common.glsl

@@ -140,7 +140,7 @@ bool nbl_glsl_MC_op_isBXDForCoatOrBlend(in uint op)
 #elif defined(OP_COATING)
 	return op<=OP_COATING;
 #else
-	return op_isBXDF(op);
+	return nbl_glsl_MC_op_isBXDF(op);
 #endif
 }
 bool nbl_glsl_MC_op_hasSpecular(in uint op)

src/nbl/asset/CShaderIntrospector.cpp

@@ -698,16 +698,18 @@ static void introspectStructType(spirv_cross::Compiler& _comp, impl::SShaderMemo
                 member.count_specID = sc->id;
             }
         }
-		else if (mtype.basetype != spirv_cross::SPIRType::Struct) // might have to ignore a few more types than structs
-			member.arrayStride = core::max(0x1u<<core::findMSB(member.size),16u); // @Crisspl  NOT TRUE FOR MATRICES!
+        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});
         else
 		{
             member.mtxRowCnt = mtype.vecsize;
             member.mtxColCnt = mtype.columns;
-            if (member.mtxColCnt > 1u) // @Crisspl why are you checking columns to get stride? What about row major?
+            if (member.mtxColCnt > 1u)
                 member.mtxStride = _comp.type_struct_member_matrix_stride(_parentType, m);
         }
     }