[PATCH vkd3d 10/41] vkd3d: Move vkd3d_find_shader into private header.
Hans-Kristian Arntzen
post at arntzen-software.no
Wed Jan 29 05:51:39 CST 2020
Signed-off-by: Hans-Kristian Arntzen <post at arntzen-software.no>
---
libs/vkd3d-shader/spirv.c | 21 ---------------------
libs/vkd3d-shader/vkd3d_shader_private.h | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index f286f8b..351c505 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -108,27 +108,6 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd
#endif /* HAVE_SPIRV_TOOLS */
-struct vkd3d_struct
-{
- enum vkd3d_shader_structure_type type;
- const void *next;
-};
-
-#define vkd3d_find_struct(c, t) vkd3d_find_struct_(c, VKD3D_SHADER_STRUCTURE_TYPE_##t)
-static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain,
- enum vkd3d_shader_structure_type type)
-{
- while (chain)
- {
- if (chain->type == type)
- return chain;
-
- chain = chain->next;
- }
-
- return NULL;
-}
-
static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d_sysval_semantic sysval,
unsigned int index)
{
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 135b48b..804d71c 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -923,6 +923,27 @@ static inline unsigned int vkd3d_compact_swizzle(unsigned int swizzle, unsigned
return compacted_swizzle;
}
+struct vkd3d_struct
+{
+ enum vkd3d_shader_structure_type type;
+ const void *next;
+};
+
+#define vkd3d_find_struct(c, t) vkd3d_find_struct_(c, VKD3D_SHADER_STRUCTURE_TYPE_##t)
+static inline const void *vkd3d_find_struct_(const struct vkd3d_struct *chain,
+ enum vkd3d_shader_structure_type type)
+{
+ while (chain)
+ {
+ if (chain->type == type)
+ return chain;
+
+ chain = chain->next;
+ }
+
+ return NULL;
+}
+
#define VKD3D_DXBC_MAX_SOURCE_COUNT 6
#define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t))
--
2.25.0
More information about the wine-devel
mailing list