fixes to get it to compile after merge from master + old bugs in median

Author: keptsecret

26_Autoexposure/CMakeLists.txt

@@ -4,7 +4,15 @@ if(NOT RES)
 	message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
 endif()
 
-nbl_create_executable_project("" "" "" "" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
+set(NBL_INCLUDE_SERACH_DIRECTORIES
+	"${CMAKE_CURRENT_SOURCE_DIR}/include"
+)
+
+list(APPEND NBL_LIBRARIES
+	Nabla::ext::FullScreenTriangle
+)
+
+nbl_create_executable_project("" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_LIBRARIES}" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
 
 if(NBL_EMBED_BUILTIN_RESOURCES)
 	set(_BR_TARGET_ ${EXECUTABLE_NAME}_builtinResourceData)

26_Autoexposure/app_resources/median_luma_meter.comp.hlsl

@@ -67,7 +67,7 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     TexAccessor tex;
 
     using LumaMeter = luma_meter::median_meter< WorkgroupSize, 8000, PtrAccessor, SharedAccessor, TexAccessor>;
-    LumaMeter meter = LumaMeter::create(pushData.lumaMinMax, pushData.sampleCount);
+    LumaMeter meter = LumaMeter::create(pushData.lumaMinMax);
 
     meter.sampleLuma(pushData.window, histo_accessor, tex, sdata, (float32_t2)(glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()), pushData.viewportSize);
 }

26_Autoexposure/app_resources/median_luma_tonemap.comp.hlsl

@@ -73,7 +73,7 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     TexAccessor tex;
 
     using LumaMeter = luma_meter::median_meter< WorkgroupSize, 8000, PtrAccessor, SharedAccessor, TexAccessor>;
-    LumaMeter meter = LumaMeter::create(pushData.lumaMinMax, pushData.sampleCount);
+    LumaMeter meter = LumaMeter::create(pushData.lumaMinMax);
 
     float32_t EV = meter.gatherLuma(histo_accessor, sdata);
 

26_Autoexposure/main.cpp

@@ -42,7 +42,7 @@ class AutoexposureApp final : public SimpleWindowedApplication, public BuiltinRe
 		"app_resources/present.frag.hlsl"
 	};
 	constexpr static inline MeteringMode MeterMode = MeteringMode::AVERAGE;
-	constexpr static inline uint32_t BinCount = 8000;
+	constexpr static inline uint32_t BinCount = 8000;	// TODO: it's 8000 here why? gonna set it to workgroup size (1024) for now
 	constexpr static inline uint32_t2 Dimensions = { 1280, 720 };
 	constexpr static inline float32_t2 MeteringWindowScale = { 0.8f, 0.8f };
 	constexpr static inline float32_t2 MeteringWindowOffset = { 0.1f, 0.1f };
@@ -314,16 +314,26 @@ class AutoexposureApp final : public SimpleWindowedApplication, public BuiltinRe
 
 				const uint32_t workgroupSize = m_physicalDevice->getLimits().maxComputeWorkGroupInvocations;
 				const uint32_t subgroupSize = m_physicalDevice->getLimits().maxSubgroupSize;
-				const IShaderCompiler::SMacroDefinition defines[2] = {
+
+				struct MacroDefines
+				{
+					std::string identifier;
+					std::string definition;
+				};
+				const MacroDefines definesBuf[2] = {
 					{ "WorkgroupSize", std::to_string(workgroupSize) },
 					{ "DeviceSubgroupSize", std::to_string(subgroupSize) }
 				};
-			    options.preprocessorOptions.extraDefines = { defines, defines + 2 };
+
+				std::vector<IShaderCompiler::SMacroDefinition> defines;
+				for (uint32_t i = 0; i < 2; i++)
+					defines.emplace_back(definesBuf[i].identifier, definesBuf[i].definition);
+			    options.preprocessorOptions.extraDefines = defines;
 
 				auto overriddenSource = compiler->compileToSPIRV((const char*)source->getContent()->getPointer(), options);
 				if (!overriddenSource)
 				{
-					m_logger->log("Shader creationed failed: %s!", ILogger::ELL_ERROR, pathToShader);
+					m_logger->log("Shader creationed failed: %s!", ILogger::ELL_ERROR, pathToShader.c_str());
 					std::exit(-1);
 				}