Giovanni Mascellani : vkd3d-shader/dxbc: Remove flag is_dxil.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 204c8afb9cf993277abc4941a875701fa50ab8d6
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/204c8afb9cf993277abc4941a87570...

Author: Giovanni Mascellani 
Date:   Fri Mar  1 14:14:27 2024 +0100

vkd3d-shader/dxbc: Remove flag is_dxil.

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 a3d23abc..e318ad08 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -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->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 1b891b9e..14aea329 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 e29ae89e..9981ec3f 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 aa3f566a..64126e7d 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
     {