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/d3d-asm: Get rid of the (now) redundant "shader_desc" parameter to vkd3d_dxbc_binary_to_text().

Browse Source 
And rename the function to d3d_asm_compile() while we're touching it.
This commit is contained in:
Henri Verbeet 2024-03-11 15:23:57 +01:00 committed by Alexandre Julliard
parent b831ffe96c
commit bdc096d437
Notes: Alexandre Julliard 2024-03-12 22:59:10 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/709
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/d3d_asm.c
View File

@ -2222,8 +2222,8 @@ static enum vkd3d_result dump_signatures(struct vkd3d_d3d_asm_compiler *compiler
return VKD3D_OK; return VKD3D_OK;
} }
enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, enum vkd3d_result d3d_asm_compile(const struct vsir_program *program,
const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_code *out, enum vsir_asm_flags flags) struct vkd3d_shader_code *out, enum vsir_asm_flags flags)
{ {
const struct vkd3d_shader_version *shader_version = &program->shader_version; const struct vkd3d_shader_version *shader_version = &program->shader_version;
@ -2357,7 +2357,7 @@ void vkd3d_shader_trace(const struct vsir_program *program)
const char *p, *q, *end; const char *p, *q, *end;
struct vkd3d_shader_code code; struct vkd3d_shader_code code;
if (vkd3d_dxbc_binary_to_text(program, NULL, NULL, &code, VSIR_ASM_FLAG_DUMP_TYPES) != VKD3D_OK) if (d3d_asm_compile(program, NULL, &code, VSIR_ASM_FLAG_DUMP_TYPES) != VKD3D_OK)
return; return;
end = (const char *)code.code + code.size; end = (const char *)code.code + code.size;

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

@ -1563,7 +1563,7 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser,
switch (compile_info->target_type) switch (compile_info->target_type)
{ {
case VKD3D_SHADER_TARGET_D3D_ASM: case VKD3D_SHADER_TARGET_D3D_ASM:
ret = vkd3d_dxbc_binary_to_text(program, &parser->shader_desc, compile_info, out, VSIR_ASM_FLAG_NONE); ret = d3d_asm_compile(program, compile_info, out, VSIR_ASM_FLAG_NONE);
break; break;
case VKD3D_SHADER_TARGET_GLSL: case VKD3D_SHADER_TARGET_GLSL:

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

@ -1404,8 +1404,8 @@ enum vsir_asm_flags
VSIR_ASM_FLAG_DUMP_TYPES = 0x1, VSIR_ASM_FLAG_DUMP_TYPES = 0x1,
}; };
enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vsir_program *program, enum vkd3d_result d3d_asm_compile(const struct vsir_program *program,
const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_code *out, enum vsir_asm_flags flags); struct vkd3d_shader_code *out, enum vsir_asm_flags flags);
void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer);
struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list);