wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/glsl: Implement VKD3DSIH_IMAX.

Browse Source
This commit is contained in:
Henri Verbeet 2024-10-03 16:42:41 +02:00
parent c2a42214ff
commit fc8384462f
Notes: Henri Verbeet 2024-10-08 22:11:09 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1155
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1186,15 +1186,16 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *gen,
case VKD3DSIH_LTO: case VKD3DSIH_LTO:
shader_glsl_relop(gen, ins, "<", "lessThan"); shader_glsl_relop(gen, ins, "<", "lessThan");
break; break;
case VKD3DSIH_IMUL: case VKD3DSIH_IMAX:
shader_glsl_mul_extended(gen, ins);
break;
case VKD3DSIH_MAX: case VKD3DSIH_MAX:
shader_glsl_intrinsic(gen, ins, "max"); shader_glsl_intrinsic(gen, ins, "max");
break; break;
case VKD3DSIH_MIN: case VKD3DSIH_MIN:
shader_glsl_intrinsic(gen, ins, "min"); shader_glsl_intrinsic(gen, ins, "min");
break; break;
case VKD3DSIH_IMUL:
shader_glsl_mul_extended(gen, ins);
break;
case VKD3DSIH_INE: case VKD3DSIH_INE:
case VKD3DSIH_NEU: case VKD3DSIH_NEU:
shader_glsl_relop(gen, ins, "!=", "notEqual"); shader_glsl_relop(gen, ins, "!=", "notEqual");

2
tests/hlsl/arithmetic-int-uniform.shader_test
View File

@ -98,7 +98,7 @@ float4 main() : SV_TARGET
[test] [test]
uniform 0 float4 5.0 -7.0 0.0 -10.0 uniform 0 float4 5.0 -7.0 0.0 -10.0
todo(glsl) draw quad draw quad
probe (0, 0) rgba (5.0, 7.0, 0.0, 10.0) probe (0, 0) rgba (5.0, 7.0, 0.0, 10.0)
[pixel shader todo(sm<4)] [pixel shader todo(sm<4)]