Zebediah Figura : vkd3d-shader: Adjust the API for struct vkd3d_shader_macro.
Alexandre Julliard
julliard at winehq.org
Fri Oct 16 15:49:15 CDT 2020
Module: vkd3d
Branch: master
Commit: 1c2344818d433adc2d2d88379611544770cef2bc
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1c2344818d433adc2d2d88379611544770cef2bc
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Oct 15 15:27:25 2020 -0500
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 at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 74e2eb0..03225d3 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -635,12 +635,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;
};
@@ -713,7 +717,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;
More information about the wine-cvs
mailing list