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_NOT.

Browse Source
This commit is contained in:
Henri Verbeet 2024-05-03 21:14:29 +02:00
parent 1812258f37
commit 01ba2ba6db
Notes: Henri Verbeet 2024-10-01 17:35:47 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1134
6 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -547,6 +547,22 @@ static void shader_glsl_endif(struct vkd3d_glsl_generator *gen)
vkd3d_string_buffer_printf(gen->buffer, "}\n");
}
static void shader_glsl_unary_op(struct vkd3d_glsl_generator *gen,
const struct vkd3d_shader_instruction *ins, const char *op)
{
struct glsl_src src;
struct glsl_dst dst;
uint32_t mask;
mask = glsl_dst_init(&dst, gen, ins, &ins->dst[0]);
glsl_src_init(&src, gen, &ins->src[0], mask);
shader_glsl_print_assignment(gen, &dst, "%s%s", op, src.str->buffer);
glsl_src_cleanup(&src, &gen->string_buffers);
glsl_dst_cleanup(&dst, &gen->string_buffers);
}
static void shader_glsl_mov(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins)
{
struct glsl_src src;
@ -818,6 +834,9 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *gen,
case VKD3DSIH_MUL:
shader_glsl_binop(gen, ins, "*");
break;
case VKD3DSIH_NOT:
shader_glsl_unary_op(gen, ins, "~");
break;
case VKD3DSIH_OR:
shader_glsl_binop(gen, ins, "|");
break;

4
tests/hlsl/cf-cond-types.shader_test
View File

@ -124,8 +124,8 @@ float4 main() : sv_target
[test]
uniform 0 float4 -2.0 0.0 0.0 0.0
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
uniform 0 float4 -0.0 0.0 0.0 0.0
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)

4
tests/hlsl/conditional.shader_test
View File

@ -87,10 +87,10 @@ float4 main() : sv_target
[test]
uniform 0 float -2
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (1, 2, 3, 4)
uniform 0 float 10
todo(glsl) draw quad
draw quad
probe (0, 0) rgba (10, 20, 30, 40)

6
tests/hlsl/function-return.shader_test
View File

@ -134,13 +134,13 @@ float4 main() : sv_target
[test]
uniform 0 float 0.1
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.2, 0.1, 0.2, 0.1) 1
uniform 0 float 0.5
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.5, 0.4, 1.0, 0.9) 1
uniform 0 float 0.9
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (1.0, 0.9, 1.0, 0.6) 1
[pixel shader]

16
tests/hlsl/return.shader_test
View File

@ -37,10 +37,10 @@ float4 main() : sv_target
[test]
uniform 0 float 0.2
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
uniform 0 float 0.8
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8)
[pixel shader todo(sm<4)]
@ -89,13 +89,13 @@ void main(out float4 ret : sv_target)
[test]
uniform 0 float 0.1
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) 1
uniform 0 float 0.5
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.2, 0.3, 0.4, 0.5) 1
uniform 0 float 0.9
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) 1
[pixel shader todo(sm<4)]
@ -115,13 +115,13 @@ void main(out float4 ret : sv_target)
[test]
uniform 0 float 0.1
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) 1
uniform 0 float 0.5
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8) 1
uniform 0 float 0.9
todo(sm<4 | glsl) draw quad
todo(sm<4) draw quad
probe (0, 0) rgba (0.4, 0.5, 0.6, 0.7) 1
[pixel shader]

2
tests/hlsl/unroll.shader_test
View File

@ -19,7 +19,7 @@ float4 main() : sv_target
[test]
uniform 0 float 1
todo(glsl|sm<4) draw quad
todo(sm<4) draw quad
probe (0,0) rgba(10.0, 1.0, 2.0, 3.0)
[pixel shader]