avoid parameter conflicts with nedi_jinc

This commit is contained in:
hizzlekizzle 2019-04-24 11:08:19 -05:00 committed by GitHub
parent 443db93201
commit 780b4b9701
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -41,18 +41,18 @@ layout(push_constant) uniform Push
vec4 OriginalSize; vec4 OriginalSize;
vec4 OutputSize; vec4 OutputSize;
uint FrameCount; uint FrameCount;
float JINC2_WINDOW_SINC; float NEDI_JINC2_WINDOW_SINC;
float JINC2_SINC; float NEDI_JINC2_SINC;
float JINC2_AR_STRENGTH; float NEDI_JINC2_AR_STRENGTH;
} params; } params;
#pragma parameter JINC2_WINDOW_SINC "Window Sinc Param" 0.42 0.0 1.0 0.01 #pragma parameter JNEDI_INC2_WINDOW_SINC "Window Sinc Param" 0.42 0.0 1.0 0.01
#pragma parameter JINC2_SINC "Sinc Param" 0.92 0.0 1.0 0.01 #pragma parameter NEDI_JINC2_SINC "Sinc Param" 0.92 0.0 1.0 0.01
#pragma parameter JINC2_AR_STRENGTH "Anti-ringing Strength" 0.8 0.0 1.0 0.1 #pragma parameter NEDI_JINC2_AR_STRENGTH "Anti-ringing Strength" 0.8 0.0 1.0 0.1
#define JINC2_WINDOW_SINC params.JINC2_WINDOW_SINC #define JINC2_WINDOW_SINC params.NEDI_JINC2_WINDOW_SINC
#define JINC2_SINC params.JINC2_SINC #define JINC2_SINC params.NEDI_JINC2_SINC
#define JINC2_AR_STRENGTH params.JINC2_AR_STRENGTH #define JINC2_AR_STRENGTH params.NEDI_JINC2_AR_STRENGTH
layout(std140, set = 0, binding = 0) uniform UBO layout(std140, set = 0, binding = 0) uniform UBO
{ {