wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Hide support for DXIL sources.

Browse Source 
Unfortunately this is not sufficiently ready to release.
This commit is contained in:
Henri Verbeet 2023-09-18 13:54:00 +02:00 committed by Alexandre Julliard
parent b8f2c3e1f4
commit da89da2bf3
Notes: Alexandre Julliard 2023-09-18 22:14:19 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/350
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/private/vkd3d_shader_utils.h
View File

@ -43,12 +43,16 @@ static inline enum vkd3d_result vkd3d_shader_parse_dxbc_source_type(const struct
if (tag == TAG_SHDR || tag == TAG_SHEX) if (tag == TAG_SHDR || tag == TAG_SHEX)
{ {
*type = VKD3D_SHADER_SOURCE_DXBC_TPF; *type = VKD3D_SHADER_SOURCE_DXBC_TPF;
#ifndef VKD3D_SHADER_UNSUPPORTED_DXIL
break;
#else
} }
else if (tag == TAG_DXIL) else if (tag == TAG_DXIL)
{ {
*type = VKD3D_SHADER_SOURCE_DXBC_DXIL; *type = VKD3D_SHADER_SOURCE_DXBC_DXIL;
/* Default to DXIL if both are present. */ /* Default to DXIL if both are present. */
break; break;
#endif
} }
} }

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

@ -2920,6 +2920,8 @@ int vkd3d_shader_sm6_parser_create(const struct vkd3d_shader_compile_info *compi
struct sm6_parser *sm6; struct sm6_parser *sm6;
int ret; int ret;
ERR("Creating a DXIL parser. This is unsupported; you get to keep all the pieces if it breaks.\n");
if (!(sm6 = vkd3d_calloc(1, sizeof(*sm6)))) if (!(sm6 = vkd3d_calloc(1, sizeof(*sm6))))
{ {
ERR("Failed to allocate parser.\n"); ERR("Failed to allocate parser.\n");

4
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@ -1647,7 +1647,9 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns
VKD3D_SHADER_SOURCE_DXBC_TPF, VKD3D_SHADER_SOURCE_DXBC_TPF,
VKD3D_SHADER_SOURCE_HLSL, VKD3D_SHADER_SOURCE_HLSL,
VKD3D_SHADER_SOURCE_D3D_BYTECODE, VKD3D_SHADER_SOURCE_D3D_BYTECODE,
#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL
VKD3D_SHADER_SOURCE_DXBC_DXIL, VKD3D_SHADER_SOURCE_DXBC_DXIL,
#endif
}; };
TRACE("count %p.\n", count); TRACE("count %p.\n", count);
@ -1686,7 +1688,9 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types(
switch (source_type) switch (source_type)
{ {
#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL
case VKD3D_SHADER_SOURCE_DXBC_DXIL: case VKD3D_SHADER_SOURCE_DXBC_DXIL:
#endif
case VKD3D_SHADER_SOURCE_DXBC_TPF: case VKD3D_SHADER_SOURCE_DXBC_TPF:
*count = ARRAY_SIZE(dxbc_tpf_types); *count = ARRAY_SIZE(dxbc_tpf_types);
return dxbc_tpf_types; return dxbc_tpf_types;