wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Use a bool type for "new_cond" in lower_conditional_block_discard_nz().

Browse Source 
This fixes the assertion error

    "sm4_generate_vsir_instr_expr Failed assertion: dst_type->e.numeric.type == HLSL_TYPE_BOOL"

which occurs when compiling the following HLSL shader using the ps_4_0 target profile:

    uniform float4 x;
    uniform bool b;

    float4 main() : SV_Target
    {
        if (!b)
            clip(x.x);
        else
            clip(x.y);

        return x;
    }
This commit is contained in:
Shaun Ren
2025-11-06 14:32:51 -05:00
committed by Henri Verbeet
parent 0c9a5b7a0c
commit 58d02da892
Notes: Henri Verbeet 2025-11-10 16:27:19 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1817
2 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4099,7 +4099,6 @@ static bool lower_conditional_block_stores(struct hlsl_ctx *ctx, struct hlsl_ir_
static bool lower_conditional_block_discard_nz(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, static bool lower_conditional_block_discard_nz(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
struct hlsl_ir_node *cond, bool is_then) struct hlsl_ir_node *cond, bool is_then)
{ {
struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {0};
struct hlsl_ir_node *discard_cond, *new_cond = NULL; struct hlsl_ir_node *discard_cond, *new_cond = NULL;
struct hlsl_ir_jump *jump; struct hlsl_ir_jump *jump;
struct hlsl_block block; struct hlsl_block block;
@@ -4122,12 +4121,8 @@ static bool lower_conditional_block_discard_nz(struct hlsl_ctx *ctx, struct hlsl
cond = hlsl_block_add_unary_expr(ctx, &block, HLSL_OP1_LOGIC_NOT, cond, &instr->loc); cond = hlsl_block_add_unary_expr(ctx, &block, HLSL_OP1_LOGIC_NOT, cond, &instr->loc);
discard_cond = hlsl_block_add_cast(ctx, &block, discard_cond, cond->data_type, &instr->loc); discard_cond = hlsl_block_add_cast(ctx, &block, discard_cond, cond->data_type, &instr->loc);
operands[0] = cond;
operands[1] = discard_cond;
/* discard_nz (cond && discard_cond) */ /* discard_nz (cond && discard_cond) */
new_cond = hlsl_block_add_expr(ctx, &block, HLSL_OP2_LOGIC_AND, operands, new_cond = hlsl_block_add_binary_expr(ctx, &block, HLSL_OP2_LOGIC_AND, cond, discard_cond);
hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &jump->node.loc);
list_move_before(&jump->node.entry, &block.instrs); list_move_before(&jump->node.entry, &block.instrs);
hlsl_src_remove(&jump->condition); hlsl_src_remove(&jump->condition);

42
tests/hlsl/clip.shader_test
View File

@@ -10,19 +10,49 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 1 2 3 4 uniform 0 float4 1 2 3 4
todo(glsl) draw quad todo(glsl) draw quad
probe (0, 0) rgba (1, 2, 3, 4) probe (0, 0) f32(1, 2, 3, 4)
uniform 0 float4 9 8 7 6 uniform 0 float4 9 8 7 6
todo(glsl) draw quad todo(glsl) draw quad
probe (0, 0) rgba (9, 8, 7, 6) probe (0, 0) f32(9, 8, 7, 6)
uniform 0 float4 -1 8 7 6 uniform 0 float4 -1 8 7 6
todo(glsl) draw quad todo(glsl) draw quad
probe (0, 0) rgba (9, 8, 7, 6) probe (0, 0) f32(9, 8, 7, 6)
uniform 0 float4 9 0 7 6 uniform 0 float4 9 0 7 6
todo(glsl) draw quad todo(glsl) draw quad
probe (0, 0) rgba (9, 0, 7, 6) probe (0, 0) f32(9, 0, 7, 6)
uniform 0 float4 3 -8 3 0 uniform 0 float4 3 -8 3 0
todo(glsl) draw quad todo(glsl) draw quad
probe (0, 0) rgba (9, 0, 7, 6) probe (0, 0) f32(9, 0, 7, 6)
uniform 0 float4 3 3 3 -1 uniform 0 float4 3 3 3 -1
todo(glsl) draw quad todo(glsl) draw quad
probe (0, 0) rgba (9, 0, 7, 6) probe (0, 0) f32(9, 0, 7, 6)
[pixel shader]
uniform float4 x;
uniform bool b;
float4 main() : SV_Target
{
if (!b)
clip(x.x);
else
clip(x.y);
return x;
}
[test]
uniform 0 float4 1 -2 3 4
if(sm<4) uniform 4 float 0
if(sm>=4) uniform 4 uint 0
todo(glsl) draw quad
probe (0, 0) f32(1, -2, 3, 4)
uniform 0 float4 9 -8 7 6
if(sm<4) uniform 4 float 1
if(sm>=4) uniform 4 uint 1
todo(glsl) draw quad
probe (0, 0) f32(1, -2, 3, 4)
if(sm<4) uniform 4 float 0
if(sm>=4) uniform 4 uint 0
todo(glsl) draw quad
probe (0, 0) f32(9, -8, 7, 6)