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: Adjust the API for struct vkd3d_shader_macro.

Browse Source 
To more closely match the behaviour of D3D_SHADER_MACRO.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-10-15 15:27:25 -05:00 committed by Alexandre Julliard
parent 5d9398e10c
commit 1c2344818d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/vkd3d_shader.h
View File

@ -635,12 +635,16 @@ struct vkd3d_shader_spirv_domain_shader_target_info
struct vkd3d_shader_macro struct vkd3d_shader_macro
{ {
/** /**
* A null-terminated string containing the name of a macro. This macro must * Pointer to a null-terminated string containing the name of a macro. This
* not be a parameterized (i.e. function-like) macro. If this field is not a * macro must not be a parameterized (i.e. function-like) macro. If this
* valid macro identifier, it will be ignored. * field is not a valid macro identifier, this macro will be ignored.
*/ */
const char *name; const char *name;
/** A null-terminated string containing the expansion of the macro. */ /**
* Optional pointer to a null-terminated string containing the expansion of
* the macro. This field may be set to NULL, in which case the macro has an
* empty expansion.
*/
const char *value; const char *value;
}; };
@ -713,7 +717,7 @@ struct vkd3d_shader_preprocess_info
* be expanded as if a corresponding #define statement were prepended to the * be expanded as if a corresponding #define statement were prepended to the
* source code. * source code.
* *
* If the same macro is specified multiple times, only the first value is * If the same macro is specified multiple times, only the last value is
* used. * used.
*/ */
const struct vkd3d_shader_macro *macros; const struct vkd3d_shader_macro *macros;