Merge branch 'master' into cad-text-rendering

Author: Erfan-Ahmadi

05_StreamingAndBufferDeviceAddressApp/main.cpp

@@ -127,7 +127,7 @@ class StreamingAndBufferDeviceAddressApp final : public application_templates::M
 			m_downStreamingBufferAddress = m_downStreamingBuffer->getBuffer()->getDeviceAddress();
 
 			// People love Reflection but I prefer Shader Sources instead!
-			const nbl::asset::SPushConstantRange pcRange = {.stageFlags=IShader::ESS_COMPUTE,.offset=0,.size=sizeof(PushConstantData)};
+			const nbl::asset::SPushConstantRange pcRange = {.stageFlags=IShader::E_SHADER_STAGE::ESS_COMPUTE,.offset=0,.size=sizeof(PushConstantData)};
 
 			// This time we'll have no Descriptor Sets or Layouts because our workload has a widely varying size
 			// and using traditional SSBO bindings would force us to update the Descriptor Set every frame.
@@ -236,7 +236,7 @@ class StreamingAndBufferDeviceAddressApp final : public application_templates::M
 					.outputAddress=m_downStreamingBufferAddress+outputOffset,
 					.dataElementCount=elementCount
 				};
-				cmdbuf->pushConstants(m_pipeline->getLayout(),IShader::ESS_COMPUTE,0u,sizeof(pc),&pc);
+				cmdbuf->pushConstants(m_pipeline->getLayout(),IShader::E_SHADER_STAGE::ESS_COMPUTE,0u,sizeof(pc),&pc);
 				// Good old trick to get rounded up divisions, in case you're not familiar
 				cmdbuf->dispatch((elementCount-1)/WorkgroupSize+1,1,1);
 				cmdbuf->end();

61_UI/main.cpp

@@ -365,7 +365,7 @@ class UISampleApp final : public examples::SimpleWindowedApplication
 			if (!device_base_t::onAppInitialized(smart_refctd_ptr(system)))
 				return false;
 
-			m_semaphore = m_device->createSemaphore(m_submitIx);
+			m_semaphore = m_device->createSemaphore(m_realFrameIx);
 			if (!m_semaphore)
 				return logFail("Failed to Create a Semaphore!");
 
@@ -594,7 +594,7 @@ class UISampleApp final : public examples::SimpleWindowedApplication
 				{ 
 					{
 						.semaphore = m_semaphore.get(),
-						.value = ++m_submitIx,
+						.value = ++m_realFrameIx,
 						.stageMask = PIPELINE_STAGE_FLAGS::COLOR_ATTACHMENT_OUTPUT_BIT
 					} 
 				};
@@ -623,7 +623,7 @@ class UISampleApp final : public examples::SimpleWindowedApplication
 						};
 
 						if (queue->submit(infos) != IQueue::RESULT::SUCCESS)
-							m_submitIx--;
+							m_realFrameIx--;
 					}
 				}
 
@@ -682,7 +682,6 @@ class UISampleApp final : public examples::SimpleWindowedApplication
 		smart_refctd_ptr<ISemaphore> m_semaphore;
 		smart_refctd_ptr<IGPUCommandPool> m_cmdPool;
 		uint64_t m_realFrameIx : 59 = 0;
-		uint64_t m_submitIx : 59 = 0;
 		uint64_t m_maxFramesInFlight : 5;
 		std::array<smart_refctd_ptr<IGPUCommandBuffer>, ISwapchain::MaxImages> m_cmdBufs;
 		ISimpleManagedSurface::SAcquireResult m_currentImageAcquire = {};

old_to_refactor/07.SubpassBaking/main.cpp

@@ -0,0 +1,13 @@
+include(common RESULT_VARIABLE RES)
+if(NOT RES)
+	message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
+endif()
+
+set(EXAMPLE_SOURCES
+	../../src/nbl/ext/LumaMeter/CLumaMeter.cpp
+	../../src/nbl/ext/ToneMapper/CToneMapper.cpp
+)
+
+set(ASSET_DIR ${PROJECT_SOURCE_DIR}/examples_tests/media) 
+
+nbl_create_executable_project("${EXAMPLE_SOURCES}" "" "" ${ASSET_DIR})

old_to_refactor/23.Autoexposure/CMakeLists.txt

@@ -0,0 +1,19 @@
+#version 430 core
+
+// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+
+// vertex shader is provided by the fullScreenTriangle extension
+
+layout (set = 3, binding = 0) uniform usampler2DArray tex0;
+
+layout(location = 0) in vec2 TexCoord;
+
+layout(location = 0) out vec4 pixelColor;
+
+void main()
+{
+    const uint packed = texture(tex0, vec3(TexCoord.x, TexCoord.y, 1.0)).r;
+    pixelColor = unpackUnorm4x8(packed);
+}