move UV transform to front of SParameterSet, keep variable length stuff last

Author: devshgraphicsprogramming

include/nbl/asset/material_compiler3/CFrontendIR.h

@@ -131,7 +131,7 @@ class CFrontendIR final : public CNodePool
 			float scale = std::numeric_limits<float>::infinity();
 			// rest are ignored if the view is null
 			uint8_t viewChannel : 2 = 0;
-			uint8_t padding[3] = {0,0,0};
+			uint8_t padding[3] = {0,0,0}; // TODO: padding stores metadata, shall we exclude from assignment and copy operators?
 			core::smart_refctd_ptr<const ICPUImageView> view = {};
 			// shadow comparison functions are ignored
 			// NOTE: could take only things that matter from the sampler and pack the viewChannel and reduce padding
@@ -189,13 +189,13 @@ class CFrontendIR final : public CNodePool
 					printDot<StringConstIterator>(Count,sstr,selfID,std::forward<StringConstIterator>(paramNameBegin),uvRequired);
 				}
 
-				SParameter params[Count] = {};
 				// identity transform by default, ignored if no UVs
 				// NOTE: a transform could be applied per-param, whats important that the UV slot remains the smae across all of them.
 				hlsl::float32_t2x3 uvTransform = hlsl::float32_t2x3(
 					1,0,0,
 					0,1,0
 				);
+				SParameter params[Count] = {};
 
 				// to make sure there will be no padding inbetween
 				static_assert(alignof(SParameter)>=alignof(hlsl::float32_t2x3));

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -337,7 +337,7 @@ SAssetBundle CMitsubaLoader::loadAsset(system::IFile* _file, const IAssetLoader:
 		}
 
 		ctx.transferMetadata();
-		return asset::SAssetBundle(std::move(result.metadata),{std::move(ctx.scene)});
+		return SAssetBundle(std::move(result.metadata),{std::move(ctx.scene)});
 	}
 }
 
@@ -503,8 +503,10 @@ hlsl::float32_t2x3 SContext::getParameters(const std::span<parameter_t,3> out, c
 		const auto param = getTexture(src.texture,&retval);
 		for (auto c=0; c<out.size(); c++)
 		{
-			out[c] = param;
+			out[c].scale = param.scale;
 			out[c].viewChannel = param.viewChannel+c;
+			out[c].view = param.view;
+			out[c].sampler = param.sampler;
 		}
 	}
 	else
@@ -528,7 +530,16 @@ hlsl::float32_t2x3 SContext::getParameters(const std::span<parameter_t> out, con
 {
 	auto retval = hlsl::math::linalg::diagonal<hlsl::float32_t2x3>(0.f);
     if (src.texture)
-		std::fill(out.begin(),out.end(),getTexture(src.texture,&retval));
+	{
+		const auto param = getTexture(src.texture,&retval);
+		for (auto c=0; c<out.size(); c++)
+		{
+			out[c].scale = param.scale;
+			out[c].viewChannel = param.viewChannel+c;
+			out[c].view = param.view;
+			out[c].sampler = param.sampler;
+		}
+	}
     else
 		MitsubaLoader::getParameters(out,src.value);
 	return retval;