id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 22:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Vulkan descriptor set selection within bink and bink_gui shaders

Browse source
This commit is contained in:
Stephen Saunders 2022-12-12 17:55:08 -05:00
parent f41cc5e46a
commit fbeb02df9c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
neo/shaders/builtin/video/bink.ps.hlsl
View file

@ -30,11 +30,11 @@ If you have questions concerning this license or the applicable additional terms
// *INDENT-OFF*
Texture2D t_Y : register( t0 VK_DESCRIPTOR_SET( 1 ) );
Texture2D t_Cr : register( t1 VK_DESCRIPTOR_SET( 1 ) );
Texture2D t_Cb : register( t2 VK_DESCRIPTOR_SET( 1 ) );
Texture2D t_Y : register( t0 VK_DESCRIPTOR_SET( 0 ) );
Texture2D t_Cr : register( t1 VK_DESCRIPTOR_SET( 0 ) );
Texture2D t_Cb : register( t2 VK_DESCRIPTOR_SET( 0 ) );
SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 2 ) );
SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 1 ) );
struct PS_IN {
@ -67,4 +67,4 @@ void main( PS_IN fragment, out PS_OUT result )
color *= rpColor;
result.color = sRGBAToLinearRGBA( color );
}
}

10
neo/shaders/builtin/video/bink_gui.ps.hlsl
View file

@ -30,11 +30,11 @@ If you have questions concerning this license or the applicable additional terms
// *INDENT-OFF*
Texture2D t_Y : register( t0 VK_DESCRIPTOR_SET( 1 ) );
Texture2D t_Cr : register( t1 VK_DESCRIPTOR_SET( 1 ) );
Texture2D t_Cb : register( t2 VK_DESCRIPTOR_SET( 1 ) );
Texture2D t_Y : register( t0 VK_DESCRIPTOR_SET( 0 ) );
Texture2D t_Cr : register( t1 VK_DESCRIPTOR_SET( 0 ) );
Texture2D t_Cb : register( t2 VK_DESCRIPTOR_SET( 0 ) );
SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 2 ) );
SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 1 ) );
struct PS_IN {
float4 position : SV_Position;
@ -69,4 +69,4 @@ void main( PS_IN fragment, out PS_OUT result )
float4 color = ( binkImage * fragment.color ) + fragment.texcoord1;
result.color.xyz = color.xyz * color.w;
result.color.w = color.w;
}
}