Merge pull request #45 from AnastaZIuk/master

Optix bug reproduction - input & output denoiser DDS data

Author: devshgraphicsprogramming

cmake/FindOptiX.cmake

@@ -29,6 +29,10 @@ macro(_find_version_path targetVersion targetPath rootName searchList )
 	    string ( REGEX MATCH "${rootName}(.*)([0-9]+).([0-9]+).([0-9]+)(.*)$" result "${checkdir}" )
 	    if ( "${result}" STREQUAL "${checkdir}" )
 	       # found a path with versioning 
+          if(${CMAKE_MATCH_2} LESS "7" OR ${CMAKE_MATCH_2} EQUAL "7" AND ${CMAKE_MATCH_3} LESS "2") 
+		   message(STATUS "Found OptiX ${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}. Expecting 7.2.0 or higher")
+           continue()
+          endif()
 	       SET ( ver "${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}" )
 	       if ( ver GREATER bestver )
 	  	    SET ( bestver ${ver} )
@@ -78,10 +82,15 @@ if (DEFINED OPTIX_LOCATION OR DEFINED ENV{OPTIX_LOCATION} )
   # Locate by version failed. Handle user override for OPTIX_LOCATION.
   string ( REGEX MATCH ".*([0-9]+).([0-9]+).([0-9]+)(.*)$" result "${OPTIX_LOCATION}" )
   if ( "${result}" STREQUAL "${OPTIX_LOCATION}" )
+	if(${CMAKE_MATCH_2} LESS "7" OR ${CMAKE_MATCH_2} EQUAL "7" AND ${CMAKE_MATCH_3} LESS "2") 
+      message(STATUS "Found OptiX ${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}. Expecting 7.2.0 or higher")
+      continue()
+    else()
     SET ( bestver "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}" )
     SET ( bestmajorver ${CMAKE_MATCH_1})
     SET ( bestminorver ${CMAKE_MATCH_2})
     Message(STATUS "found version ${bestver}")
+	endif()
   else()
     Message(WARNING "Could NOT extract the version from OptiX folder : ${result}")
   endif()

examples_tests/39.DenoiserTonemapper/CommandLineHandler.cpp

@@ -10,7 +10,7 @@ using namespace nbl;
 using namespace asset;
 using namespace core;
 
-CommandLineHandler::CommandLineHandler(core::vector<std::string> argv, IAssetManager* am) : status(false), assetManager(am)
+CommandLineHandler::CommandLineHandler(core::vector<std::string> argv, IAssetManager* am, nbl::io::IFileSystem* fs) : status(false), assetManager(am)
 {
 	auto startEntireTime = std::chrono::steady_clock::now();
 
@@ -28,6 +28,7 @@ CommandLineHandler::CommandLineHandler(core::vector<std::string> argv, IAssetMan
 	auto mitsubaLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am,fs);
 	mitsubaLoader->initialize();
 	am->addAssetLoader(std::move(mitsubaLoader));
+
 	core::vector<std::array<std::string, PROPER_CMD_ARGUMENTS_AMOUNT>> argvMappedList;
 
 	auto pushArgvList = [&](auto argvStream, auto variableCount)
@@ -343,20 +344,19 @@ nbl::core::matrix3x4SIMD CommandLineHandler::getCameraTransform(uint64_t id)
 		assert(!meshes_bundle.isEmpty(), ("ERROR (" + std::to_string(__LINE__) + " line): The xml file is invalid! Id of input stride: " + std::to_string(id)).c_str());
 		auto endTime = std::chrono::steady_clock::now();
 		elapsedTimeXmls += (endTime - startTime);
-
+		
 		auto mesh = meshes_bundle.getContents().begin()[0];
 		auto mesh_raw = static_cast<asset::ICPUMesh*>(mesh.get());
-		const auto mitsubaMetadata = static_cast<const ext::MitsubaLoader::CMitsubaMetadata*>(mesh_raw->getMetadata());
-		const auto data = mitsubaMetadata->getMitsubaMetadata();
+		const auto mitsubaMetadata = static_cast<const ext::MitsubaLoader::CMitsubaMetadata*>(meshes_bundle.getMetadata());
 
-		bool validateFlag = data->sensors.empty();
+		bool validateFlag = mitsubaMetadata->m_global.m_sensors.empty();
 		if (validateFlag)
 		{
 			os::Printer::log("ERROR (" + std::to_string(__LINE__) + " line): The is no transform matrix in " + filePath + " ! Id of input stride: " + std::to_string(id), ELL_ERROR);
 			assert(validateFlag);
 		}
 
-		auto transformReference = data->sensors[0].transform.matrix.extractSub3x4();
+		auto transformReference = mitsubaMetadata->m_global.m_sensors[0].transform.matrix.extractSub3x4();
 		transformReference.setTranslation(core::vectorSIMDf(0, 0, 0, 0));
 
 		return transformReference;

examples_tests/39.DenoiserTonemapper/CommandLineHandler.hpp

@@ -181,7 +181,7 @@ class CommandLineHandler
 {
 	public:
 
-		CommandLineHandler(nbl::core::vector<std::string> argv, nbl::asset::IAssetManager* am);
+		CommandLineHandler(nbl::core::vector<std::string> argv, nbl::asset::IAssetManager* am, nbl::io::IFileSystem* fs);
 
 		auto getInputFilesAmount()
 		{

examples_tests/39.DenoiserTonemapper/ShaderCommon.glsl

@@ -2,7 +2,7 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#define COMPUTE_WG_SIZE 256u
+#define COMPUTE_WG_SIZE 256
 layout(local_size_x=COMPUTE_WG_SIZE) in;
 
 layout(constant_id = 1) const uint EII_COLOR = 0u;
@@ -17,9 +17,9 @@ layout(push_constant, row_major) uniform PushConstants{
 #define _NBL_GLSL_EXT_LUMA_METER_PUSH_CONSTANTS_DEFINED_
 
 
-#define SHARED_CHANNELS 3u
+#define SHARED_CHANNELS 3
 // the amount of memory needed for luma metering is bigger than interleaving
-#define _NBL_GLSL_SCRATCH_SHARED_SIZE_DEFINED_ ((COMPUTE_WG_SIZE+1u)*8u)
+#define _NBL_GLSL_SCRATCH_SHARED_SIZE_DEFINED_ ((COMPUTE_WG_SIZE+1)*8)
 shared uint repackBuffer[_NBL_GLSL_SCRATCH_SHARED_SIZE_DEFINED_];
 #define _NBL_GLSL_SCRATCH_SHARED_DEFINED_ repackBuffer
 
@@ -29,8 +29,11 @@ shared uint repackBuffer[_NBL_GLSL_SCRATCH_SHARED_SIZE_DEFINED_];
 #define _NBL_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_X_DEFINED_ 256
 #define _NBL_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_Y_DEFINED_ 1
 
-#define _NBL_GLSL_EXT_LUMA_METER_MIN_LUMA_DEFINED_ floatBitsToInt(1.0/4096.0)
-#define _NBL_GLSL_EXT_LUMA_METER_MAX_LUMA_DEFINED_ floatBitsToInt(32768.0)
+#define _NBL_GLSL_EXT_LUMA_METER_MIN_LUMA_DEFINED_ 0x39800000
+// floatBitsToInt(1.0/4096.0) glslc got a lot more anal since last version
+#define _NBL_GLSL_EXT_LUMA_METER_MAX_LUMA_DEFINED_ 0x47000000
+// floatBitsToInt(32768.0) glslc got a lot more anal since last version
+
 // its the mean mode
 #define _NBL_GLSL_EXT_LUMA_METER_MODE_DEFINED_ 1
 
@@ -50,6 +53,7 @@ shared uint repackBuffer[_NBL_GLSL_SCRATCH_SHARED_SIZE_DEFINED_];
 
 #define _NBL_GLSL_EXT_LUMA_METER_INVOCATION_COUNT (_NBL_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_X_DEFINED_*_NBL_GLSL_EXT_LUMA_METER_DISPATCH_SIZE_Y_DEFINED_)
 #define _NBL_GLSL_EXT_LUMA_METER_BIN_COUNT _NBL_GLSL_EXT_LUMA_METER_INVOCATION_COUNT
+#define _NBL_GLSL_WORKGROUP_SIZE_ _NBL_GLSL_EXT_LUMA_METER_BIN_COUNT
 #define _NBL_GLSL_EXT_LUMA_METER_BIN_GLOBAL_REPLICATION 4
 #ifdef _NBL_GLSL_EXT_LUMA_METER_FIRST_PASS_DEFINED_
 	#include "nbl/builtin/glsl/ext/LumaMeter/impl.glsl"