Merge branch 'master' into resizable_cache

Author: Fletterio

30_ComputeShaderPathTracer/main.cpp

@@ -694,9 +694,9 @@ class ComputeShaderPathtracer final : public examples::SimpleWindowedApplication
 			// Update Descriptors
 			{
 				ISampler::SParams samplerParams0 = {
-					ISampler::ETC_CLAMP_TO_EDGE,
-					ISampler::ETC_CLAMP_TO_EDGE,
-					ISampler::ETC_CLAMP_TO_EDGE,
+					ISampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_EDGE,
+					ISampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_EDGE,
+					ISampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_EDGE,
 					ISampler::ETBC_FLOAT_OPAQUE_BLACK,
 					ISampler::ETF_LINEAR,
 					ISampler::ETF_LINEAR,
@@ -707,9 +707,9 @@ class ComputeShaderPathtracer final : public examples::SimpleWindowedApplication
 				};
 				auto sampler0 = m_device->createSampler(samplerParams0);
 				ISampler::SParams samplerParams1 = {
-					ISampler::ETC_CLAMP_TO_EDGE,
-					ISampler::ETC_CLAMP_TO_EDGE,
-					ISampler::ETC_CLAMP_TO_EDGE,
+					ISampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_EDGE,
+					ISampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_EDGE,
+					ISampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_EDGE,
 					ISampler::ETBC_INT_OPAQUE_BLACK,
 					ISampler::ETF_NEAREST,
 					ISampler::ETF_NEAREST,
@@ -781,9 +781,9 @@ class ComputeShaderPathtracer final : public examples::SimpleWindowedApplication
 				{
 					IGPUSampler::SParams params;
 					params.AnisotropicFilter = 1u;
-					params.TextureWrapU = ISampler::ETC_REPEAT;
-					params.TextureWrapV = ISampler::ETC_REPEAT;
-					params.TextureWrapW = ISampler::ETC_REPEAT;
+					params.TextureWrapU = ISampler::E_TEXTURE_CLAMP::ETC_REPEAT;
+					params.TextureWrapV = ISampler::E_TEXTURE_CLAMP::ETC_REPEAT;
+					params.TextureWrapW = ISampler::E_TEXTURE_CLAMP::ETC_REPEAT;
 
 					m_ui.samplers.gui = m_device->createSampler(params);
 					m_ui.samplers.gui->setObjectDebugName("Nabla IMGUI UI Sampler");

70_FLIPFluids/main.cpp

@@ -330,13 +330,13 @@ class FLIPFluidsApp final : public examples::SimpleWindowedApplication, public a
         }
 
         IGPUSampler::SParams samplerParams = {};
-        samplerParams.TextureWrapU = IGPUSampler::ETC_CLAMP_TO_BORDER;
-        samplerParams.TextureWrapV = IGPUSampler::ETC_CLAMP_TO_BORDER;
-        samplerParams.TextureWrapW = IGPUSampler::ETC_CLAMP_TO_BORDER;
-        samplerParams.BorderColor  = IGPUSampler::ETBC_FLOAT_TRANSPARENT_BLACK;
-        samplerParams.MinFilter		= IGPUSampler::ETF_LINEAR;
-        samplerParams.MaxFilter		= IGPUSampler::ETF_LINEAR;
-        samplerParams.MipmapMode	= IGPUSampler::ESMM_LINEAR;
+        samplerParams.TextureWrapU = IGPUSampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_BORDER;
+        samplerParams.TextureWrapV = IGPUSampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_BORDER;
+        samplerParams.TextureWrapW = IGPUSampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_BORDER;
+        samplerParams.BorderColor  = IGPUSampler::E_TEXTURE_BORDER_COLOR::ETBC_FLOAT_TRANSPARENT_BLACK;
+        samplerParams.MinFilter		= IGPUSampler::E_TEXTURE_FILTER::ETF_LINEAR;
+        samplerParams.MaxFilter		= IGPUSampler::E_TEXTURE_FILTER::ETF_LINEAR;
+        samplerParams.MipmapMode	= IGPUSampler::E_SAMPLER_MIPMAP_MODE::ESMM_LINEAR;
         samplerParams.AnisotropicFilter = 3;
         samplerParams.CompareEnable = false;
         velocityFieldSampler = m_device->createSampler(samplerParams);
@@ -1427,9 +1427,9 @@ class FLIPFluidsApp final : public examples::SimpleWindowedApplication, public a
                 options.stage = IShader::E_SHADER_STAGE::ESS_VERTEX;
             options.targetSpirvVersion = m_device->getPhysicalDevice()->getLimits().spirvVersion;
             options.spirvOptimizer = nullptr;
-		#ifndef _NBL_DEBUG
-		    ISPIRVOptimizer::E_OPTIMIZER_PASS optPasses = ISPIRVOptimizer::EOP_STRIP_DEBUG_INFO;
-		    auto opt = make_smart_refctd_ptr<ISPIRVOptimizer>(std::span<ISPIRVOptimizer::E_OPTIMIZER_PASS>(&optPasses, 1));
+        #ifndef _NBL_DEBUG
+            ISPIRVOptimizer::E_OPTIMIZER_PASS optPasses = ISPIRVOptimizer::EOP_STRIP_DEBUG_INFO;
+            auto opt = make_smart_refctd_ptr<ISPIRVOptimizer>(std::span<ISPIRVOptimizer::E_OPTIMIZER_PASS>(&optPasses, 1));
             options.spirvOptimizer = opt.get();
         #endif
             options.debugInfoFlags |= IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_SOURCE_BIT;