From c1c0334bf2107896bbf75c2d9c37e9675bb1ebfa Mon Sep 17 00:00:00 2001 From: Stephen Pridham Date: Fri, 18 Nov 2022 08:00:13 -0500 Subject: [PATCH] Fix VK descriptor set slot for motionBlur shader --- neo/shaders/builtin/post/motionBlur.ps.hlsl | 6 +++--- neo/shaders/builtin/post/motionBlur.vs.hlsl | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/neo/shaders/builtin/post/motionBlur.ps.hlsl b/neo/shaders/builtin/post/motionBlur.ps.hlsl index 8548161a..f50cf154 100644 --- a/neo/shaders/builtin/post/motionBlur.ps.hlsl +++ b/neo/shaders/builtin/post/motionBlur.ps.hlsl @@ -32,10 +32,10 @@ If you have questions concerning this license or the applicable additional terms // *INDENT-OFF* -Texture2D t_ViewColor : register( t0 VK_DESCRIPTOR_SET( 1 ) ); -Texture2D t_ViewDepth : register( t1 VK_DESCRIPTOR_SET( 1 ) ); +Texture2D t_ViewColor : register( t0 VK_DESCRIPTOR_SET( 0 ) ); +Texture2D t_ViewDepth : register( t1 VK_DESCRIPTOR_SET( 0 ) ); -SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 2 ) ); +SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 1 ) ); struct PS_IN diff --git a/neo/shaders/builtin/post/motionBlur.vs.hlsl b/neo/shaders/builtin/post/motionBlur.vs.hlsl index 4566bae3..bf407207 100644 --- a/neo/shaders/builtin/post/motionBlur.vs.hlsl +++ b/neo/shaders/builtin/post/motionBlur.vs.hlsl @@ -26,9 +26,6 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "global_inc.hlsl" - - // *INDENT-OFF* struct VS_IN {