system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 09:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Rename shader_extract_from_dxbc to wined3d_shader_extract_from_dxbc.

Browse source 
Stops a linker error of duplicate name when using upstream vkd3d.
This commit is contained in:
Alistair Leslie-Hughes 2023-05-17 17:46:24 +10:00 committed by Alexandre Julliard
parent 1d281c620d
commit 0f41f29a22
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/wined3d/shader.c
View file

@ -2481,7 +2481,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device
shader->byte_code_size = desc->byte_code_size;
max_version = shader_max_version_from_feature_level(device->cs->c.state->feature_level);
if (FAILED(hr = shader_extract_from_dxbc(shader, max_version, &source_type)))
if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &source_type)))
goto fail;
if (!(shader->frontend = shader_select_frontend(source_type)))

2
dlls/wined3d/shader_sm4.c
View file

@ -2077,7 +2077,7 @@ static HRESULT shader_dxbc_process_section(struct wined3d_shader *shader, unsign
return S_OK;
}
HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader,
HRESULT wined3d_shader_extract_from_dxbc(struct wined3d_shader *shader,
unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type)
{
const struct vkd3d_shader_code dxbc = {.code = shader->byte_code, .size = shader->byte_code_size};

2
dlls/wined3d/wined3d_private.h
View file

@ -1466,7 +1466,7 @@ struct wined3d_shader_frontend
extern const struct wined3d_shader_frontend sm1_shader_frontend DECLSPEC_HIDDEN;
extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN;
HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader,
HRESULT wined3d_shader_extract_from_dxbc(struct wined3d_shader *shader,
unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) DECLSPEC_HIDDEN;
BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader,
const struct wined3d_stream_output_element *so_element, unsigned int *register_idx,