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

Fixed failed graphics state if vertex_color shader is called

Browse source
This commit is contained in:
Robert Beckebans 2022-05-14 10:18:08 +02:00
parent 5177b3b121
commit cc11531f8d
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
neo/shaders/builtin/color.vs.hlsl
View file

@ -39,7 +39,8 @@ register( b1 )
#endif
// *INDENT-OFF*
struct VS_IN {
struct VS_IN
{
float4 position : POSITION;
float2 texcoord : TEXCOORD0;
float4 normal : NORMAL;
@ -48,7 +49,8 @@ struct VS_IN {
float4 color2 : COLOR1;
};
struct VS_OUT {
struct VS_OUT
{
float4 position : SV_Position;
};
// *INDENT-ON*

9
neo/shaders/builtin/vertex_color.ps.hlsl
View file

@ -3,7 +3,7 @@
Doom 3 BFG Edition GPL Source Code
Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
Copyright (C) 2013 Robert Beckebans
Copyright (C) 2013-2022 Robert Beckebans
This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").
@ -31,11 +31,10 @@ If you have questions concerning this license or the applicable additional terms
// *INDENT-OFF*
SamplerState samp0 : register( s0 );
struct PS_IN
{
float4 color : COLOR0;
float4 position : SV_POSITION;
float4 color : COLOR0;
};
struct PS_OUT
@ -44,7 +43,7 @@ struct PS_OUT
};
// *INDENT-ON*
void main( PS_IN fragment, out PS_OUT result )
void main( in PS_IN fragment, out PS_OUT result )
{
result.color = sRGBAToLinearRGBA( fragment.color );
}

3
neo/shaders/builtin/vertex_color.vs.hlsl
View file

@ -38,11 +38,12 @@ struct VS_IN
float4 normal : NORMAL;
float4 tangent : TANGENT;
float4 color : COLOR0;
float4 color2 : COLOR1;
};
struct VS_OUT
{
float4 position : POSITION;
float4 position : SV_Position;
float4 color : COLOR0;
};
// *INDENT-ON*