[PATCH vkd3d] vkd3d-shader: Adjust the API for struct vkd3d_shader_macro.
To more closely match the behaviour of D3D_SHADER_MACRO. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/vkd3d_shader.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index c168621a..d9e95d7b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -686,12 +686,16 @@ struct vkd3d_shader_spirv_domain_shader_target_info struct vkd3d_shader_macro { /** - * A null-terminated string containing the name of a macro. This macro must - * not be a parameterized (i.e. function-like) macro. If this field is not a - * valid macro identifier, it will be ignored. + * Pointer to a null-terminated string containing the name of a macro. This + * macro must not be a parameterized (i.e. function-like) macro. If this + * field is not a valid macro identifier, this macro will be ignored. */ 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; }; @@ -764,7 +768,7 @@ struct vkd3d_shader_preprocess_info * be expanded as if a corresponding #define statement were prepended to the * 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. */ const struct vkd3d_shader_macro *macros; -- 2.28.0
participants (2)
-
Henri Verbeet -
Zebediah Figura