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-compiler: Introduce a dxbc-dxil source type.

Browse Source
This commit is contained in:
Conor McCarthy 2022-11-15 15:18:26 +10:00 committed by Alexandre Julliard
parent d3e6a3a78f
commit 8c7704bb78
Notes: Alexandre Julliard 2023-06-28 23:04:34 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/44
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
programs/vkd3d-compiler/main.c
View File

@ -30,6 +30,7 @@
#include "vkd3d_common.h" #include "vkd3d_common.h"
#include "vkd3d_shader.h" #include "vkd3d_shader.h"
#include "vkd3d_shader_utils.h"
#ifdef HAVE_NCURSES #ifdef HAVE_NCURSES
#include <term.h> #include <term.h>
#endif #endif
@ -73,6 +74,10 @@ source_type_info[] =
"d3dbc", "Legacy Direct3D byte-code.\n" "d3dbc", "Legacy Direct3D byte-code.\n"
" This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n", " This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n",
true, VKD3D_SHADER_TARGET_SPIRV_BINARY}, true, VKD3D_SHADER_TARGET_SPIRV_BINARY},
{VKD3D_SHADER_SOURCE_DXBC_DXIL,
"dxbc-dxil", "A 'DirectX Intermediate Language' shader embedded in a DXBC container.\n"
" This is the format used for Direct3D shader model 6 shaders.\n",
true, VKD3D_SHADER_TARGET_SPIRV_BINARY},
}; };
static const struct target_type_info static const struct target_type_info
@ -356,6 +361,22 @@ static enum vkd3d_shader_target_type parse_target_type(const char *target)
return VKD3D_SHADER_TARGET_NONE; return VKD3D_SHADER_TARGET_NONE;
} }
static bool parse_dxbc_source_type(const struct vkd3d_shader_code *source, enum vkd3d_shader_source_type *type)
{
char *messages;
int ret;
if ((ret = vkd3d_shader_parse_dxbc_source_type(source, type, &messages)) < 0)
{
fprintf(stderr, "Failed to detect dxbc source type, ret %d.\n", ret);
if (messages)
fputs(messages, stderr);
vkd3d_shader_free_messages(messages);
return false;
}
return true;
}
static const struct source_type_info *get_source_type_info(enum vkd3d_shader_source_type type) static const struct source_type_info *get_source_type_info(enum vkd3d_shader_source_type type)
{ {
unsigned int i; unsigned int i;
@ -671,7 +692,10 @@ int main(int argc, char **argv)
{ {
memcpy(&token, info.source.code, sizeof(token)); memcpy(&token, info.source.code, sizeof(token));
if (token == TAG_DXBC) if (token == TAG_DXBC)
options.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; {
if (!parse_dxbc_source_type(&info.source, &options.source_type))
return 1;
}
else if ((token & 0xfffe0000) == 0xfffe0000) else if ((token & 0xfffe0000) == 0xfffe0000)
options.source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; options.source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE;
else else