diff --git a/WickedEngine/shaders/ShaderInterop_FSR2.h b/WickedEngine/shaders/ShaderInterop_FSR2.h index 8dd92c464..9a842ce90 100644 --- a/WickedEngine/shaders/ShaderInterop_FSR2.h +++ b/WickedEngine/shaders/ShaderInterop_FSR2.h @@ -9,7 +9,9 @@ #define FFX_HLSL #endif // __cplusplus -#define FFX_HALF 0 // doesn't compile if enabled +#ifndef FFX_HALF +#define FFX_HALF 0 // FP16 doesn't have perf benefit for me +#endif // FFX_HALF #define FFX_FSR2_OPTION_INVERTED_DEPTH 1 #define FFX_FSR2_OPTION_HDR_COLOR_INPUT 1 @@ -20,6 +22,6 @@ #define FFX_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE 1 #define FFX_FSR2_OPTION_GUARANTEE_UPSAMPLE_WEIGHT_ON_NEW_SAMPLES 1 #define FFX_FSR2_OPTION_REPROJECT_SAMPLERS_USE_DATA_HALF 1 -#define FFX_FSR2_OPTION_UPSAMPLE_SAMPLERS_USE_DATA_HALF 1 +#define FFX_FSR2_OPTION_UPSAMPLE_SAMPLERS_USE_DATA_HALF 0 // missing header errors when enabled. They can be also deleted and it will compile, but didn't seem to make a difference #endif // WI_SHADERINTEROP_FONT_H diff --git a/WickedEngine/shaders/ffx-fsr2/ffx_fsr2_compute_luminance_pyramid_pass.hlsl b/WickedEngine/shaders/ffx-fsr2/ffx_fsr2_compute_luminance_pyramid_pass.hlsl index b12740957..f8d181f53 100644 --- a/WickedEngine/shaders/ffx-fsr2/ffx_fsr2_compute_luminance_pyramid_pass.hlsl +++ b/WickedEngine/shaders/ffx-fsr2/ffx_fsr2_compute_luminance_pyramid_pass.hlsl @@ -19,6 +19,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#define FFX_HALF 0 // doesn't compile if enabled #include "ShaderInterop_FSR2.h" #define FSR2_BIND_SRV_INPUT_COLOR 0 diff --git a/WickedEngine/shaders/ffx-fsr2/ffx_fsr2_reconstruct_previous_depth_pass.hlsl b/WickedEngine/shaders/ffx-fsr2/ffx_fsr2_reconstruct_previous_depth_pass.hlsl index 303722c5b..fa1b77e61 100644 --- a/WickedEngine/shaders/ffx-fsr2/ffx_fsr2_reconstruct_previous_depth_pass.hlsl +++ b/WickedEngine/shaders/ffx-fsr2/ffx_fsr2_reconstruct_previous_depth_pass.hlsl @@ -32,7 +32,7 @@ #define FSR2_BIND_SRV_MOTION_VECTORS 0 #define FSR2_BIND_SRV_DEPTH 1 #define FSR2_BIND_SRV_REACTIVE_MASK 2 -#define FSR2_BIND_SRV_TRANSPARENCY_AND_COMPOSITION_MASK 3 +//#define FSR2_BIND_SRV_TRANSPARENCY_AND_COMPOSITION_MASK 3 #define FSR2_BIND_SRV_PREPARED_INPUT_COLOR 4 #define FSR2_BIND_UAV_RECONSTRUCTED_PREV_NEAREST_DEPTH 0 #define FSR2_BIND_UAV_DILATED_MOTION_VECTORS 1 diff --git a/WickedEngine/wiRenderPath3D.cpp b/WickedEngine/wiRenderPath3D.cpp index 7b79be9ce..743f49dfc 100644 --- a/WickedEngine/wiRenderPath3D.cpp +++ b/WickedEngine/wiRenderPath3D.cpp @@ -1937,7 +1937,7 @@ namespace wi TextureDesc desc; desc.bind_flags = BindFlag::SHADER_RESOURCE | BindFlag::UNORDERED_ACCESS; - desc.format = rtPostprocess.desc.format; + desc.format = Format::R11G11B10_FLOAT; desc.width = GetPhysicalWidth(); desc.height = GetPhysicalHeight(); device->CreateTexture(&desc, nullptr, &rtFSR[0]); @@ -1969,7 +1969,7 @@ namespace wi TextureDesc desc; desc.bind_flags = BindFlag::SHADER_RESOURCE | BindFlag::UNORDERED_ACCESS; - desc.format = rtPostprocess.desc.format; + desc.format = Format::R11G11B10_FLOAT; desc.width = GetPhysicalWidth(); desc.height = GetPhysicalHeight(); device->CreateTexture(&desc, nullptr, &rtFSR[0]); diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 68ed82db1..bf5476e64 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wi::version // minor features, major updates, breaking compatibility changes const int minor = 71; // minor bug fixes, alterations, refactors, updates - const int revision = 103; + const int revision = 104; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);