From a5a2c8784d752494e3f8ab141277f722f5f22021 Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Tue, 9 Jul 2024 17:20:40 +0200 Subject: [PATCH] Fixes for luminance pyramid pass and gen reactive pass --- .../FSR3/ffx_fsr3upscaler_autogen_reactive_pass.compute | 2 +- ....compute => ffx_fsr3upscaler_luma_pyramid_pass.compute} | 4 ++-- ...eta => ffx_fsr3upscaler_luma_pyramid_pass.compute.meta} | 0 Assets/Shaders/FSR3/shaders/fsr3upscaler/spd/ffx_spd.h | 7 ------- 4 files changed, 3 insertions(+), 10 deletions(-) rename Assets/Shaders/FSR3/{ffx_fsr3upscaler_compute_luminance_pyramid_pass.compute => ffx_fsr3upscaler_luma_pyramid_pass.compute} (95%) rename Assets/Shaders/FSR3/{ffx_fsr3upscaler_compute_luminance_pyramid_pass.compute.meta => ffx_fsr3upscaler_luma_pyramid_pass.compute.meta} (100%) diff --git a/Assets/Shaders/FSR3/ffx_fsr3upscaler_autogen_reactive_pass.compute b/Assets/Shaders/FSR3/ffx_fsr3upscaler_autogen_reactive_pass.compute index e13c001..e290582 100644 --- a/Assets/Shaders/FSR3/ffx_fsr3upscaler_autogen_reactive_pass.compute +++ b/Assets/Shaders/FSR3/ffx_fsr3upscaler_autogen_reactive_pass.compute @@ -1,4 +1,4 @@ -// Copyright (c) 2023 Nico de Poel +// Copyright (c) 2024 Nico de Poel // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Assets/Shaders/FSR3/ffx_fsr3upscaler_compute_luminance_pyramid_pass.compute b/Assets/Shaders/FSR3/ffx_fsr3upscaler_luma_pyramid_pass.compute similarity index 95% rename from Assets/Shaders/FSR3/ffx_fsr3upscaler_compute_luminance_pyramid_pass.compute rename to Assets/Shaders/FSR3/ffx_fsr3upscaler_luma_pyramid_pass.compute index d5903c0..37683d8 100644 --- a/Assets/Shaders/FSR3/ffx_fsr3upscaler_compute_luminance_pyramid_pass.compute +++ b/Assets/Shaders/FSR3/ffx_fsr3upscaler_luma_pyramid_pass.compute @@ -1,4 +1,4 @@ -// Copyright (c) 2023 Nico de Poel +// Copyright (c) 2024 Nico de Poel // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -39,4 +39,4 @@ #define FFX_SPD_NO_WAVE_OPERATIONS //#endif -#include "shaders/ffx_fsr3upscaler_compute_luminance_pyramid_pass.hlsl" +#include "shaders/ffx_fsr3upscaler_luma_pyramid_pass.hlsl" diff --git a/Assets/Shaders/FSR3/ffx_fsr3upscaler_compute_luminance_pyramid_pass.compute.meta b/Assets/Shaders/FSR3/ffx_fsr3upscaler_luma_pyramid_pass.compute.meta similarity index 100% rename from Assets/Shaders/FSR3/ffx_fsr3upscaler_compute_luminance_pyramid_pass.compute.meta rename to Assets/Shaders/FSR3/ffx_fsr3upscaler_luma_pyramid_pass.compute.meta diff --git a/Assets/Shaders/FSR3/shaders/fsr3upscaler/spd/ffx_spd.h b/Assets/Shaders/FSR3/shaders/fsr3upscaler/spd/ffx_spd.h index c3ee50f..6d4f997 100644 --- a/Assets/Shaders/FSR3/shaders/fsr3upscaler/spd/ffx_spd.h +++ b/Assets/Shaders/FSR3/shaders/fsr3upscaler/spd/ffx_spd.h @@ -119,9 +119,6 @@ FfxFloat32x4 SpdReduce4(FfxFloat32x4 v0, FfxFloat32x4 v1, FfxFloat32x4 v2, FfxFl #endif // #if FFX_SPD_PACKED_ONLY //_____________________________________________________________/\_______________________________________________________________ -#if defined(FFX_GLSL) && !defined(FFX_SPD_NO_WAVE_OPERATIONS) -#extension GL_KHR_shader_subgroup_quad:require -#endif void ffxSpdWorkgroupShuffleBarrier() { @@ -578,10 +575,6 @@ void SpdDownsample(FfxUInt32x2 workGroupID, FfxUInt32 localInvocationIndex, FfxU #if FFX_HALF -#if defined(FFX_GLSL) -#extension GL_EXT_shader_subgroup_extended_types_float16:require -#endif - FfxFloat16x4 SpdReduceQuadH(FfxFloat16x4 v) { #if defined(FFX_GLSL) && !defined(FFX_SPD_NO_WAVE_OPERATIONS)