From: Giovanni Mascellani gmascellani@codeweavers.com
The full shader profile is already available in vsir_program. --- libs/vkd3d-shader/dxil.c | 1 - libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/tpf.c | 1 - libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index c37540ae8..04646ecaf 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -8380,7 +8380,6 @@ int vkd3d_shader_sm6_parser_create(const struct vkd3d_shader_compile_info *compi }
shader_desc = &sm6->p.shader_desc; - shader_desc->is_dxil = true; shader_desc->byte_code = dxbc_desc.byte_code; shader_desc->byte_code_size = dxbc_desc.byte_code_size;
diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 1b891b9ef..14aea3291 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3720,7 +3720,7 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if ((result = instruction_array_lower_texkills(parser)) < 0) return result;
- if (parser->shader_desc.is_dxil) + if (parser->program.shader_version.major >= 6) { struct vsir_cfg cfg;
diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index e29ae89e2..9981ec3fe 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -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->is_dxil = false; shader_desc->byte_code = dxbc_desc.byte_code; shader_desc->byte_code_size = dxbc_desc.byte_code_size;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index aa3f566ae..64126e7d9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1042,7 +1042,6 @@ struct vkd3d_shader_desc { const uint32_t *byte_code; size_t byte_code_size; - bool is_dxil;
struct {