wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/glsl: Implement VKD3DSIH_DCL_INPUT_PS.

Browse Source
This commit is contained in:
Henri Verbeet 2024-05-02 19:07:45 +02:00
parent f0c8b4a3c5
commit 55de9ea405
Notes: Henri Verbeet 2024-09-26 17:49:23 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1117
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/vkd3d-shader/glsl.c
View File

@ -705,6 +705,7 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *gen,
shader_glsl_binop(gen, ins, "&");
break;
case VKD3DSIH_DCL_INPUT:
case VKD3DSIH_DCL_INPUT_PS:
case VKD3DSIH_DCL_OUTPUT:
case VKD3DSIH_DCL_OUTPUT_SIV:
case VKD3DSIH_NOP:

18
tests/hlsl/entry-point-semantics.shader_test
View File

@ -36,7 +36,7 @@ float4 main(float tex : texcoord) : sv_target
}
[test]
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2)
[pixel shader]
@ -49,7 +49,7 @@ float4 main(float tex : texcoord) : sv_target
float4 main(float tex : bogus) : bogus;
[test]
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2)
@ -85,7 +85,7 @@ float4 main(in apple a) : sv_target
}
[test]
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0)
@ -102,7 +102,7 @@ float4 main(in apple a) : sv_target
}
[test]
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (10.0, 11.0, 30.0, 31.0)
@ -126,7 +126,7 @@ float4 main(in apple aps[2][2]) : sv_target
}
[test]
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (10.0, 10.0, 20.0, 20.0)
@ -148,7 +148,7 @@ float4 main(in banana bans[2]) : sv_target
}
[test]
todo(glsl) draw quad
draw quad
todo(sm>=6) probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0)
@ -212,7 +212,7 @@ float4 main(in float4 tex0 : TEXCOORD0, in float4 tex1 : TEXCOORD1) : sv_target
}
[test]
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (1.0, 2.0, 10.0, 20.0)
@ -275,7 +275,7 @@ float4 main(in float4 t1 : TEXCOORD0, in float4 t2 : TEXCOORD0) : sv_target
}
[test]
todo(glsl) draw quad
draw quad
todo(sm>=6) probe (0, 0) rgba (99.0, 99.0, 10.0, 11.0)
@ -287,7 +287,7 @@ float4 main(in float4 a : TEXCOORD0, in float3 b : TEXCOORD1) : sv_target
}
[test]
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0)

2
tests/hlsl/struct-semantics.shader_test
View File

@ -59,5 +59,5 @@ struct output main(struct input i)
}
[test]
todo(glsl) draw triangle strip 4
draw triangle strip 4
probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0)

8
tests/hlsl/vertex-shader-ops.shader_test
View File

@ -75,12 +75,12 @@ void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos
if(sm<4) uniform 0 float 0
if(sm<4) uniform 4 float 2
if(sm>=4) uniform 0 int4 0 2 0 0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.0, 1.0, 0.0, 1.0)
if(sm<4) uniform 0 float -2
if(sm<4) uniform 4 float 8
if(sm>=4) uniform 0 int4 -2 8 0 0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
@ -103,11 +103,11 @@ if(sm<4) uniform 0 float 0
if(sm<4) uniform 4 float 100
if(sm<4) uniform 8 float 200
if(sm>=4) uniform 0 int4 0 100 200 0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2)
if(sm<4) uniform 0 float -4
if(sm<4) uniform 4 float 100
if(sm<4) uniform 8 float 200
if(sm>=4) uniform 0 int4 -4 100 200 0
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (0.1, 0.1, 0.1, 0.1)