Henri Verbeet : vkd3d-shader: Add a compiler message for unsupported DXBC versions.

Alexandre Julliard julliard at winehq.org
Thu Jul 23 16:36:45 CDT 2020


Module: vkd3d
Branch: master
Commit: 29e9cf032c698fe5e2d2bc7de19b61115d68887e
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=29e9cf032c698fe5e2d2bc7de19b61115d68887e

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Jul 23 13:59:28 2020 +0430

vkd3d-shader: Add a compiler message for unsupported DXBC versions.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/dxbc.c                 | 2 ++
 libs/vkd3d-shader/vkd3d_shader_private.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 5a070ad..8e5c49c 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -1992,6 +1992,8 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me
     if (version != 0x00000001)
     {
         WARN("Got unexpected DXBC version %#x.\n", version);
+        vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION,
+                "DXBC version %#x is not supported.", version);
         return VKD3D_ERROR_INVALID_ARGUMENT;
     }
 
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 40f986b..f9bd6ab 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -64,6 +64,7 @@ enum vkd3d_shader_error
     VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE         = 1,
     VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC        = 2,
     VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM     = 3,
+    VKD3D_SHADER_ERROR_DXBC_INVALID_VERSION      = 4,
 };
 
 enum VKD3D_SHADER_INSTRUCTION_HANDLER




More information about the wine-cvs mailing list