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/tpf: Remove hlsl_ctx from tpf_compiler.

Browse Source 
This completes the hlsl->vsir->tpf translation.
This commit is contained in:
Francisco Casas 2024-11-26 17:05:40 -03:00 committed by Henri Verbeet
parent f22729461e
commit 65b67e84a8
Notes: Henri Verbeet 2024-12-10 15:58:38 +01:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1308
4 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d-shader/hlsl.h
View File

@ -1676,9 +1676,6 @@ struct extern_resource
struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, unsigned int *count); struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, unsigned int *count);
void sm4_free_extern_resources(struct extern_resource *extern_resources, unsigned int count); void sm4_free_extern_resources(struct extern_resource *extern_resources, unsigned int count);
void sm4_generate_rdef(struct hlsl_ctx *ctx, struct vkd3d_shader_code *rdef); void sm4_generate_rdef(struct hlsl_ctx *ctx, struct vkd3d_shader_code *rdef);
int tpf_compile(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_code *rdef,
struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context,
struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func);
enum vkd3d_shader_interpolation_mode sm4_get_interpolation_mode(struct hlsl_type *type, enum vkd3d_shader_interpolation_mode sm4_get_interpolation_mode(struct hlsl_type *type,
unsigned int storage_modifiers); unsigned int storage_modifiers);

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

@ -10608,7 +10608,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
return ctx->result; return ctx->result;
} }
result = tpf_compile(&program, config_flags, &rdef, out, ctx->message_context, ctx, entry_func); result = tpf_compile(&program, config_flags, &rdef, out, ctx->message_context);
vsir_program_cleanup(&program); vsir_program_cleanup(&program);
vkd3d_shader_free_shader_code(&rdef); vkd3d_shader_free_shader_code(&rdef);
return result; return result;

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

@ -1396,8 +1396,6 @@ struct sm4_stat
struct tpf_compiler struct tpf_compiler
{ {
/* OBJECTIVE: We want to get rid of this HLSL IR specific field. */
struct hlsl_ctx *ctx;
struct vsir_program *program; struct vsir_program *program;
struct vkd3d_sm4_lookup_tables lookup; struct vkd3d_sm4_lookup_tables lookup;
struct sm4_stat *stat; struct sm4_stat *stat;
@ -3195,18 +3193,17 @@ bool sm4_sysval_semantic_from_semantic_name(enum vkd3d_shader_sysval_semantic *s
return true; return true;
} }
static void add_section(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc, static void add_section(struct tpf_compiler *tpf, uint32_t tag, struct vkd3d_bytecode_buffer *buffer)
uint32_t tag, struct vkd3d_bytecode_buffer *buffer)
{ {
/* Native D3DDisassemble() expects at least the sizes of the ISGN and OSGN /* Native D3DDisassemble() expects at least the sizes of the ISGN and OSGN
* sections to be aligned. Without this, the sections themselves will be * sections to be aligned. Without this, the sections themselves will be
* aligned, but their reported sizes won't. */ * aligned, but their reported sizes won't. */
size_t size = bytecode_align(buffer); size_t size = bytecode_align(buffer);
dxbc_writer_add_section(dxbc, tag, buffer->data, size); dxbc_writer_add_section(&tpf->dxbc, tag, buffer->data, size);
if (buffer->status < 0) if (buffer->status < 0)
ctx->result = buffer->status; tpf->result = buffer->status;
} }
static int signature_element_pointer_compare(const void *x, const void *y) static int signature_element_pointer_compare(const void *x, const void *y)
@ -3267,7 +3264,7 @@ static void tpf_write_signature(struct tpf_compiler *tpf, const struct shader_si
set_u32(&buffer, (2 + i * 6) * sizeof(uint32_t), string_offset); set_u32(&buffer, (2 + i * 6) * sizeof(uint32_t), string_offset);
} }
add_section(tpf->ctx, &tpf->dxbc, tag, &buffer); add_section(tpf, tag, &buffer);
vkd3d_free(sorted_elements); vkd3d_free(sorted_elements);
} }
@ -4842,12 +4839,11 @@ static void tpf_write_program(struct tpf_compiler *tpf, const struct vsir_progra
tpf_handle_instruction(tpf, &program->instructions.elements[i]); tpf_handle_instruction(tpf, &program->instructions.elements[i]);
} }
static void tpf_write_shdr(struct tpf_compiler *tpf, struct hlsl_ir_function_decl *entry_func) static void tpf_write_shdr(struct tpf_compiler *tpf)
{ {
const struct vsir_program *program = tpf->program; const struct vsir_program *program = tpf->program;
const struct vkd3d_shader_version *version; const struct vkd3d_shader_version *version;
struct vkd3d_bytecode_buffer buffer = {0}; struct vkd3d_bytecode_buffer buffer = {0};
struct hlsl_ctx *ctx = tpf->ctx;
size_t token_count_position; size_t token_count_position;
static const uint16_t shader_types[VKD3D_SHADER_TYPE_COUNT] = static const uint16_t shader_types[VKD3D_SHADER_TYPE_COUNT] =
@ -4892,7 +4888,7 @@ static void tpf_write_shdr(struct tpf_compiler *tpf, struct hlsl_ir_function_dec
set_u32(&buffer, token_count_position, bytecode_get_size(&buffer) / sizeof(uint32_t)); set_u32(&buffer, token_count_position, bytecode_get_size(&buffer) / sizeof(uint32_t));
add_section(ctx, &tpf->dxbc, TAG_SHDR, &buffer); add_section(tpf, TAG_SHDR, &buffer);
tpf->buffer = NULL; tpf->buffer = NULL;
} }
@ -4918,7 +4914,6 @@ static void tpf_write_stat(struct tpf_compiler *tpf)
{ {
struct vkd3d_bytecode_buffer buffer = {0}; struct vkd3d_bytecode_buffer buffer = {0};
const struct sm4_stat *stat = tpf->stat; const struct sm4_stat *stat = tpf->stat;
struct hlsl_ctx *ctx = tpf->ctx;
put_u32(&buffer, stat->fields[VKD3D_STAT_INSTR_COUNT]); put_u32(&buffer, stat->fields[VKD3D_STAT_INSTR_COUNT]);
put_u32(&buffer, stat->fields[VKD3D_STAT_TEMPS]); put_u32(&buffer, stat->fields[VKD3D_STAT_TEMPS]);
@ -4950,7 +4945,7 @@ static void tpf_write_stat(struct tpf_compiler *tpf)
put_u32(&buffer, stat->fields[VKD3D_STAT_LOD]); put_u32(&buffer, stat->fields[VKD3D_STAT_LOD]);
put_u32(&buffer, 0); /* Sample frequency */ put_u32(&buffer, 0); /* Sample frequency */
if (hlsl_version_ge(ctx, 5, 0)) if (vkd3d_shader_ver_ge(&tpf->program->shader_version, 5, 0))
{ {
put_u32(&buffer, stat->fields[VKD3D_STAT_DCL_GS_INSTANCES]); put_u32(&buffer, stat->fields[VKD3D_STAT_DCL_GS_INSTANCES]);
put_u32(&buffer, stat->fields[VKD3D_STAT_TESS_CONTROL_POINT_COUNT]); put_u32(&buffer, stat->fields[VKD3D_STAT_TESS_CONTROL_POINT_COUNT]);
@ -4962,7 +4957,7 @@ static void tpf_write_stat(struct tpf_compiler *tpf)
put_u32(&buffer, stat->fields[VKD3D_STAT_STORE]); put_u32(&buffer, stat->fields[VKD3D_STAT_STORE]);
} }
add_section(ctx, &tpf->dxbc, TAG_STAT, &buffer); add_section(tpf, TAG_STAT, &buffer);
} }
static void tpf_write_section(struct tpf_compiler *tpf, uint32_t tag, const struct vkd3d_shader_code *code) static void tpf_write_section(struct tpf_compiler *tpf, uint32_t tag, const struct vkd3d_shader_code *code)
@ -4970,15 +4965,11 @@ static void tpf_write_section(struct tpf_compiler *tpf, uint32_t tag, const stru
struct vkd3d_bytecode_buffer buffer = {0}; struct vkd3d_bytecode_buffer buffer = {0};
bytecode_put_bytes(&buffer, code->code, code->size); bytecode_put_bytes(&buffer, code->code, code->size);
add_section(tpf->ctx, &tpf->dxbc, tag, &buffer); add_section(tpf, tag, &buffer);
} }
/* OBJECTIVE: Stop relying on ctx and entry_func on this function, receiving
* data from the other parameters instead, so they can be removed from the
* arguments and this function can be independent of HLSL structs. */
int tpf_compile(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_code *rdef, int tpf_compile(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_code *rdef,
struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context)
struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func)
{ {
enum vkd3d_shader_type shader_type = program->shader_version.type; enum vkd3d_shader_type shader_type = program->shader_version.type;
struct tpf_compiler tpf = {0}; struct tpf_compiler tpf = {0};
@ -4986,7 +4977,6 @@ int tpf_compile(struct vsir_program *program, uint64_t config_flags, const struc
size_t i; size_t i;
int ret; int ret;
tpf.ctx = ctx;
tpf.program = program; tpf.program = program;
tpf.buffer = NULL; tpf.buffer = NULL;
tpf.stat = &stat; tpf.stat = &stat;
@ -4998,13 +4988,11 @@ int tpf_compile(struct vsir_program *program, uint64_t config_flags, const struc
if (shader_type == VKD3D_SHADER_TYPE_HULL || shader_type == VKD3D_SHADER_TYPE_DOMAIN) if (shader_type == VKD3D_SHADER_TYPE_HULL || shader_type == VKD3D_SHADER_TYPE_DOMAIN)
tpf_write_signature(&tpf, &program->patch_constant_signature, TAG_PCSG); tpf_write_signature(&tpf, &program->patch_constant_signature, TAG_PCSG);
tpf_write_section(&tpf, TAG_RDEF, rdef); tpf_write_section(&tpf, TAG_RDEF, rdef);
tpf_write_shdr(&tpf, entry_func); tpf_write_shdr(&tpf);
tpf_write_sfi0(&tpf); tpf_write_sfi0(&tpf);
tpf_write_stat(&tpf); tpf_write_stat(&tpf);
ret = VKD3D_OK; ret = VKD3D_OK;
if (ctx->result)
ret = ctx->result;
if (tpf.result) if (tpf.result)
ret = tpf.result; ret = tpf.result;

3
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -1683,6 +1683,9 @@ int msl_compile(struct vsir_program *program, uint64_t config_flags,
const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out,
struct vkd3d_shader_message_context *message_context); struct vkd3d_shader_message_context *message_context);
int tpf_compile(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_code *rdef,
struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context);
enum vkd3d_md5_variant enum vkd3d_md5_variant
{ {
VKD3D_MD5_STANDARD, VKD3D_MD5_STANDARD,