wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/fx: Use the same BlendState states description for both fx_4_1 and fx_5_0.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov
2025-05-06 00:41:24 +02:00
committed by Henri Verbeet
parent d660a0d2ae
commit 5d5d892830
Notes: Henri Verbeet 2025-05-06 19:06:09 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1484
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-shader/fx.c
View File

@@ -2686,7 +2686,7 @@ static void resolve_fx_4_state_block_values(struct hlsl_ir_var *var, struct hlsl
struct hlsl_ir_node *node; struct hlsl_ir_node *node;
unsigned int i; unsigned int i;
if (type->class == HLSL_CLASS_BLEND_STATE && ctx->profile->major_version == 5) if (type->class == HLSL_CLASS_BLEND_STATE && hlsl_version_ge(ctx, 4, 1))
{ {
table.ptr = fx_5_blend_states; table.ptr = fx_5_blend_states;
table.count = ARRAY_SIZE(fx_5_blend_states); table.count = ARRAY_SIZE(fx_5_blend_states);

4
tests/hlsl/effect-variables-fx_4_1.shader_test
View File

@@ -2,7 +2,7 @@
shader model >= 4.1 shader model >= 4.1
shader model < 6.0 shader model < 6.0
[effect todo] [effect]
BlendState bs BlendState bs
{ {
SrcBlend[0] = one; SrcBlend[0] = one;
@@ -13,7 +13,7 @@ BlendState bs
BlendOpAlpha[5] = add; BlendOpAlpha[5] = add;
}; };
[effect todo] [effect]
BlendState bs BlendState bs
{ {
SrcBlend = one; SrcBlend = one;