Nuked attachmentEnabled in BlendParams

Author: Erfan-Ahmadi

examples_tests/06.MeshLoaders/main.cpp

@@ -201,10 +201,6 @@ class MeshLoadersApp : public ApplicationBase
         for (size_t i = 0ull; i < meshRaw->getMeshBuffers().size(); ++i)
         {
             auto& meshBuffer = meshRaw->getMeshBuffers().begin()[i];
-
-            for (size_t i = 0ull; i < nbl::asset::SBlendParams::MAX_COLOR_ATTACHMENT_COUNT; i++)
-                meshBuffer->getPipeline()->getBlendParams().blendParams[i].attachmentEnabled = (i == 0ull);
-
             meshBuffer->getPipeline()->getRasterizationParams().frontFaceIsCCW = false;
         }
 

examples_tests/22.RaytracedAO/Renderer.cpp

@@ -674,7 +674,6 @@ void Renderer::initSceneNonAreaLights(Renderer::InitializationData& initData)
 	SBlendParams blendParams = {};
 	blendParams.logicOpEnable = false;
 	blendParams.logicOp = ELO_NO_OP;
-	blendParams.blendParams[0].attachmentEnabled = true;
 	blendParams.blendParams[0].blendEnable = true;
 	blendParams.blendParams[0].srcColorFactor = asset::EBF_ONE;
 	blendParams.blendParams[0].dstColorFactor = asset::EBF_ONE;

include/nbl/asset/IRenderpassIndependentPipeline.h

@@ -396,7 +396,6 @@ enum E_BLEND_OP : uint8_t
 struct SColorAttachmentBlendParams
 {
 	SColorAttachmentBlendParams() : 
-		attachmentEnabled(true),
 		blendEnable(false),
 		srcColorFactor(EBF_ONE),
 		dstColorFactor(EBF_ZERO),
@@ -407,37 +406,35 @@ struct SColorAttachmentBlendParams
 		colorWriteMask(0xfu)
 	{}
 
-    uint8_t attachmentEnabled : 1;
-    uint8_t blendEnable : 1;
-    uint8_t srcColorFactor : 5;
+    uint64_t blendEnable : 1;
+    uint64_t srcColorFactor : 5;
 
-    uint8_t dstColorFactor : 5;
+    uint64_t dstColorFactor : 5;
 
-    uint8_t colorBlendOp : 6;
+    uint64_t colorBlendOp : 6;
 
-    uint8_t srcAlphaFactor : 5;
+    uint64_t srcAlphaFactor : 5;
 
-    uint8_t dstAlphaFactor : 5;
+    uint64_t dstAlphaFactor : 5;
 
-    uint8_t alphaBlendOp : 2;
+    uint64_t alphaBlendOp : 2;
     //RGBA, LSB is R, MSB is A
-    uint8_t colorWriteMask : 4;
+    uint64_t colorWriteMask : 4;
 
     constexpr static size_t serializedSize() { return 5ull; }
 
     void serialize(void* _mem) const
     {
         auto* bf_dst = reinterpret_cast<uint8_t*>(_mem);
         uint64_t bf = 0;
-        bf = core::bitfieldInsert<uint64_t>(bf, attachmentEnabled, 0, 1);
-        bf = core::bitfieldInsert<uint64_t>(bf, blendEnable, 1, 1);
-        bf = core::bitfieldInsert<uint64_t>(bf, srcColorFactor, 2, 5);
-        bf = core::bitfieldInsert<uint64_t>(bf, dstColorFactor, 7, 5);
-        bf = core::bitfieldInsert<uint64_t>(bf, colorBlendOp, 12, 6);
-        bf = core::bitfieldInsert<uint64_t>(bf, srcAlphaFactor, 18, 5);
-        bf = core::bitfieldInsert<uint64_t>(bf, dstAlphaFactor, 23, 5);
-        bf = core::bitfieldInsert<uint64_t>(bf, alphaBlendOp, 28, 2);
-        bf = core::bitfieldInsert<uint64_t>(bf, colorWriteMask, 30, 4);
+        bf = core::bitfieldInsert<uint64_t>(bf, blendEnable, 0, 1);
+        bf = core::bitfieldInsert<uint64_t>(bf, srcColorFactor, 1, 5);
+        bf = core::bitfieldInsert<uint64_t>(bf, dstColorFactor, 6, 5);
+        bf = core::bitfieldInsert<uint64_t>(bf, colorBlendOp, 11, 6);
+        bf = core::bitfieldInsert<uint64_t>(bf, srcAlphaFactor, 17, 5);
+        bf = core::bitfieldInsert<uint64_t>(bf, dstAlphaFactor, 22, 5);
+        bf = core::bitfieldInsert<uint64_t>(bf, alphaBlendOp, 27, 2);
+        bf = core::bitfieldInsert<uint64_t>(bf, colorWriteMask, 29, 4);
 
         memcpy(bf_dst, &bf, serializedSize());
     }

include/nbl/ext/FullScreenTriangle/FullScreenTriangle.h

@@ -58,8 +58,6 @@ namespace nbl
 				auto& blendParams = std::get<asset::SBlendParams>(protoPipeline);
 				blendParams.logicOpEnable = false;
 				blendParams.logicOp = nbl::asset::ELO_NO_OP;
-				for (size_t i = 0ull; i < nbl::asset::SBlendParams::MAX_COLOR_ATTACHMENT_COUNT; i++)
-					blendParams.blendParams[i].attachmentEnabled = (i == 0ull);
 
 				auto& rasterParams = std::get<asset::SRasterizationParams>(protoPipeline);
 				rasterParams.faceCullingMode = nbl::asset::EFCM_NONE;

src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp

@@ -179,9 +179,6 @@ core::smart_refctd_ptr<ICPURenderpassIndependentPipeline> CGraphicsPipelineLoade
 {
     SBlendParams blendParams;
 
-    for (size_t i = 0ull; i < SBlendParams::MAX_COLOR_ATTACHMENT_COUNT; i++)
-        blendParams.blendParams[i].attachmentEnabled = (i == 0ull);
-
     std::string cacheKey("nbl/builtin/renderpass_independent_pipeline/loader/mtl/");
     {
         const uint32_t illum = _mtl.params.extra&0xfu;

src/nbl/ext/DebugDraw/CDraw3DLine.cpp

@@ -62,9 +62,7 @@ CDraw3DLine::CDraw3DLine(const core::smart_refctd_ptr<video::ILogicalDevice>& de
 		asset::SBlendParams blendParams;
 		blendParams.logicOpEnable = false;
 		blendParams.logicOp = nbl::asset::ELO_NO_OP;
-		for (size_t i = 0ull; i < nbl::asset::SBlendParams::MAX_COLOR_ATTACHMENT_COUNT; i++)
-			blendParams.blendParams[i].attachmentEnabled = (i == 0ull);
-
+		
 		m_rpindependent_pipeline = m_device->createGPURenderpassIndependentPipeline(nullptr, core::smart_refctd_ptr(layout), shaders, shaders + 2, vtxinput, blendParams, primitive, raster);
 		assert(m_rpindependent_pipeline);
 	}