Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla-Examples-and-Tests into autoexposure_ex

Author: nipunG314

62_CAD/DrawResourcesFiller.cpp

@@ -516,7 +516,7 @@ void DrawResourcesFiller::submitCurrentObjectsAndReset(SIntendedSubmitInfo& inte
 	// We don't reset counters for styles because we will be reusing them
 	resetGeometryCounters();
 
-	uint32_t newClipProjectionAddress = acquireCurrentClipProjectionAddress(intendedNextSubmit);
+	uint64_t newClipProjectionAddress = acquireCurrentClipProjectionAddress(intendedNextSubmit);
 	// If the clip projection stack is non-empty, then it means we need to re-push the clipProjectionData (because it exists in geometry data and it was reset)
 	if (newClipProjectionAddress != InvalidClipProjectionAddress)
 	{
@@ -564,7 +564,7 @@ uint32_t DrawResourcesFiller::addLineStyle_Internal(const LineStyleInfo& lineSty
 	return currentLineStylesCount++;
 }
 
-inline uint64_t DrawResourcesFiller::acquireCurrentClipProjectionAddress(SIntendedSubmitInfo& intendedNextSubmit)
+uint64_t DrawResourcesFiller::acquireCurrentClipProjectionAddress(SIntendedSubmitInfo& intendedNextSubmit)
 {
 	if (clipProjectionAddresses.empty())
 		return InvalidClipProjectionAddress;

62_CAD/main.cpp

@@ -38,7 +38,7 @@ using namespace video;
 
 static constexpr bool DebugModeWireframe = false;
 static constexpr bool DebugRotatingViewProj = false;
-static constexpr bool FragmentShaderPixelInterlock = false;
+static constexpr bool FragmentShaderPixelInterlock = true;
 
 enum class ExampleMode
 {
@@ -67,7 +67,7 @@ constexpr std::array<float, (uint32_t)ExampleMode::CASE_COUNT> cameraExtents =
 	600.0,	// CASE_8
 };
 
-constexpr ExampleMode mode = ExampleMode::CASE_8;
+constexpr ExampleMode mode = ExampleMode::CASE_3;
 
 class Camera2D
 {
@@ -479,7 +479,9 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 
 		// Create the Semaphores
 		m_renderSemaphore = m_device->createSemaphore(0ull);
+		m_renderSemaphore->setObjectDebugName("m_renderSemaphore");
 		m_overflowSubmitScratchSemaphore = m_device->createSemaphore(0ull);
+		m_overflowSubmitScratchSemaphore->setObjectDebugName("m_overflowSubmitScratchSemaphore");
 		if (!m_renderSemaphore || !m_overflowSubmitScratchSemaphore)
 			return logFail("Failed to Create Semaphores!");
 
@@ -508,7 +510,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 
 		m_framesInFlight = min(m_surface->getMaxFramesInFlight(), MaxFramesInFlight);
 
-		allocateResources(40960u);
+		allocateResources(256u);
 
 		const bitflag<IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS> bindlessTextureFlags =
 			IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_UPDATE_AFTER_BIND_BIT |
@@ -697,8 +699,6 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 			constexpr auto debugfragmentShaderPath = "../fragment_shader_debug.hlsl";
 			constexpr auto resolveAlphasShaderPath = "../resolve_alphas.hlsl";
 #if defined(SHADER_CACHE_TEST_COMPILATION_CACHE_STORE)
-			
-
 			auto cache = core::make_smart_refctd_ptr<IShaderCompiler::CCache>();
 
 			// Load Custom Shader
@@ -742,7 +742,6 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 			const bool success = bool(succ);
 			assert(success);
 #elif defined(SHADER_CACHE_TEST_CACHE_RETRIEVE)
-
 			auto savePath = localOutputCWD / "cache.bin";
 
 			core::smart_refctd_ptr<system::IFile> f;
@@ -1314,7 +1313,10 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 
 		if (inBetweenSubmit)
 		{
-			intendedSubmitInfo.overflowSubmit();
+			if (intendedSubmitInfo.overflowSubmit() != IQueue::RESULT::SUCCESS)
+			{
+				m_logger->log("overflow submit failed.", ILogger::ELL_ERROR);
+			}
 		}
 		else
 		{
@@ -1335,6 +1337,10 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 				presentWait.stageMask = PIPELINE_STAGE_FLAGS::NONE; // top of pipe, there's no explicit presentation engine stage
 				m_surface->present(m_currentImageAcquire.imageIndex,{&presentWait,1});
 			}
+			else
+			{
+				m_logger->log("regular submit failed.", ILogger::ELL_ERROR);
+			}
 		}
 	}
 
@@ -1370,6 +1376,14 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 		return retval;
 	}
 
+	virtual video::IAPIConnection::SFeatures getAPIFeaturesToEnable() override
+	{
+		auto retval = base_t::getAPIFeaturesToEnable();
+		// We only support one swapchain mode, surface, the other one is Display which we have not implemented yet.
+		retval.swapchainMode = video::E_SWAPCHAIN_MODE::ESM_SURFACE;
+		retval.validations = true;
+		return retval;
+	}
 protected:
 
 	void addObjects(SIntendedSubmitInfo& intendedNextSubmit)