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/hlsl: Emit dcl_stream instructions for SM5 geometry shaders.

Browse Source
This commit is contained in:
Shaun Ren
2025-05-26 21:33:30 -04:00
committed by Henri Verbeet
parent a743d9ae60
commit 7da7ccaf45
Notes: Henri Verbeet 2025-06-02 21:00:38 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1518
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12130,6 +12130,22 @@ static void sm4_generate_vsir_add_dcl_texture(struct hlsl_ctx *ctx,
} }
} }
static void sm4_generate_vsir_add_dcl_stream(struct hlsl_ctx *ctx,
struct vsir_program *program, const struct hlsl_ir_var *var)
{
struct vkd3d_shader_instruction *ins;
if (!(ins = generate_vsir_add_program_instruction(ctx, program, &var->loc, VKD3DSIH_DCL_STREAM, 0, 1)))
{
ctx->result = VKD3D_ERROR_OUT_OF_MEMORY;
return;
}
vsir_src_param_init(&ins->src[0], VKD3DSPR_STREAM, VKD3D_DATA_OPAQUE, 1);
ins->src[0].reg.dimension = VSIR_DIMENSION_NONE;
ins->src[0].reg.idx[0].offset = var->regs[HLSL_REGSET_STREAM_OUTPUTS].index;
}
/* OBJECTIVE: Translate all the information from ctx and entry_func to the /* OBJECTIVE: Translate all the information from ctx and entry_func to the
* vsir_program, so it can be used as input to tpf_compile() without relying * vsir_program, so it can be used as input to tpf_compile() without relying
* on ctx and entry_func. */ * on ctx and entry_func. */
@@ -12204,6 +12220,17 @@ static void sm4_generate_vsir(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl
} }
sm4_free_extern_resources(extern_resources, extern_resources_count); sm4_free_extern_resources(extern_resources, extern_resources_count);
if (version.type == VKD3D_SHADER_TYPE_GEOMETRY && version.major >= 5)
{
const struct hlsl_ir_var *var;
LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
{
if (var->bind_count[HLSL_REGSET_STREAM_OUTPUTS])
sm4_generate_vsir_add_dcl_stream(ctx, program, var);
}
}
if (version.type == VKD3D_SHADER_TYPE_HULL) if (version.type == VKD3D_SHADER_TYPE_HULL)
generate_vsir_add_program_instruction(ctx, program, generate_vsir_add_program_instruction(ctx, program,
&ctx->patch_constant_func->loc, VKD3DSIH_HS_CONTROL_POINT_PHASE, 0, 0); &ctx->patch_constant_func->loc, VKD3DSIH_HS_CONTROL_POINT_PHASE, 0, 0);

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

@@ -4176,6 +4176,7 @@ static void tpf_handle_instruction(struct tpf_compiler *tpf, const struct vkd3d_
case VKD3DSIH_CASE: case VKD3DSIH_CASE:
case VKD3DSIH_CONTINUE: case VKD3DSIH_CONTINUE:
case VKD3DSIH_CUT: case VKD3DSIH_CUT:
case VKD3DSIH_DCL_STREAM:
case VKD3DSIH_DEFAULT: case VKD3DSIH_DEFAULT:
case VKD3DSIH_DISCARD: case VKD3DSIH_DISCARD:
case VKD3DSIH_DIV: case VKD3DSIH_DIV: