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/dxbc: Remove flag is_dxil.

Browse Source 
The full shader profile is already available in vsir_program.
This commit is contained in:
Giovanni Mascellani 2024-03-01 14:14:27 +01:00 committed by Alexandre Julliard
parent 470d83a9da
commit 204c8afb9c
Notes: Alexandre Julliard 2024-03-11 23:06:10 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/680
4 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8455,7 +8455,6 @@ int vkd3d_shader_sm6_parser_create(const struct vkd3d_shader_compile_info *compi
} }
shader_desc = &sm6->p.shader_desc; shader_desc = &sm6->p.shader_desc;
shader_desc->is_dxil = true;
shader_desc->byte_code = dxbc_desc.byte_code; shader_desc->byte_code = dxbc_desc.byte_code;
shader_desc->byte_code_size = dxbc_desc.byte_code_size; shader_desc->byte_code_size = dxbc_desc.byte_code_size;

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

@ -3720,7 +3720,7 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser,
if ((result = instruction_array_lower_texkills(parser)) < 0) if ((result = instruction_array_lower_texkills(parser)) < 0)
return result; return result;
if (parser->shader_desc.is_dxil) if (parser->program.shader_version.major >= 6)
{ {
struct vsir_cfg cfg; struct vsir_cfg cfg;

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

@ -2669,7 +2669,6 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi
} }
shader_desc = &sm4->p.shader_desc; shader_desc = &sm4->p.shader_desc;
shader_desc->is_dxil = false;
shader_desc->byte_code = dxbc_desc.byte_code; shader_desc->byte_code = dxbc_desc.byte_code;
shader_desc->byte_code_size = dxbc_desc.byte_code_size; shader_desc->byte_code_size = dxbc_desc.byte_code_size;

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

@ -1042,7 +1042,6 @@ struct vkd3d_shader_desc
{ {
const uint32_t *byte_code; const uint32_t *byte_code;
size_t byte_code_size; size_t byte_code_size;
bool is_dxil;
struct struct
{ {