wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-utils: Add a D3DCompile2VKD3D() that allows configuring DLL version.

Browse Source 
This would allow us to use vkd3d-utils directly in Wine [with the exception of
D3D_COMPILE_STANDARD_FILE_INCLUDE, but we can simply pass the ID3DInclude object
to D3DCompile2VKD3D().]
This commit is contained in:
Elizabeth Figura
2024-06-21 11:26:38 -05:00
committed by Henri Verbeet
parent 6d28cc131b
commit 8515fcbc70
Notes: Henri Verbeet 2024-09-03 17:17:14 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/963
3 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/vkd3d_utils.h
View File

@ -77,6 +77,12 @@ VKD3D_UTILS_API HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_
VKD3D_UTILS_API HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename,
const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
const char *target, UINT flags, UINT effect_flags, ID3DBlob **shader, ID3DBlob **error_messages);
/**
* D3DCompile2() targets the behaviour of d3dcompiler_47.dll. To target the
* behaviour of other d3dcompiler versions, use D3DCompile2VKD3D().
*
* \since 1.3
*/
VKD3D_UTILS_API HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename,
const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
const char *target, UINT flags, UINT effect_flags, UINT secondary_flags,
@ -122,6 +128,22 @@ VKD3D_UTILS_API HRESULT WINAPI D3DDisassemble(const void *data,
/** \since 1.11 */
VKD3D_UTILS_API HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID iid, void **reflection);
/**
* As D3DCompile2(), but with an extra argument that allows targeting
* different d3dcompiler versions.
*
* \param compiler_version The d3dcompiler version to target. This should be
* set to the numerical value in the d3dcompiler library name. E.g. to target
* the behaviour of d3dcompiler_36.dll, set this parameter to 36.
*
* \since 1.14
*/
VKD3D_UTILS_API HRESULT WINAPI D3DCompile2VKD3D(const void *data, SIZE_T data_size, const char *filename,
const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
const char *target, UINT flags, UINT effect_flags, UINT secondary_flags,
const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader,
ID3DBlob **error_messages, unsigned int compiler_version);
#ifdef __cplusplus
}
#endif /* __cplusplus */