Paul Gofman : wined3d: Move validate_material_colour_source() to wined3d_private.h.
Alexandre Julliard
julliard at winehq.org
Thu May 16 16:26:58 CDT 2019
Module: wine
Branch: master
Commit: 0d79d3625ed31df62294c6ae78e63c47991d6c89
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d79d3625ed31df62294c6ae78e63c47991d6c89
Author: Paul Gofman <gofmanp at gmail.com>
Date: Wed May 15 18:06:50 2019 +0300
wined3d: Move validate_material_colour_source() to wined3d_private.h.
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/utils.c | 10 ----------
dlls/wined3d/wined3d_private.h | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 669c8cb..06ff97c 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -6378,16 +6378,6 @@ int wined3d_ffp_frag_program_key_compare(const void *key, const struct wine_rb_e
return memcmp(ka, kb, sizeof(*ka));
}
-static enum wined3d_material_color_source validate_material_colour_source(WORD use_map,
- enum wined3d_material_color_source source)
-{
- if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE))
- return source;
- if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR))
- return source;
- return WINED3D_MCS_MATERIAL;
-}
-
void wined3d_ffp_get_vs_settings(const struct wined3d_context *context,
const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings)
{
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 2525fca..0a629dd 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4840,6 +4840,16 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs)
assert(cs->thread_id != GetCurrentThreadId());
}
+static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map,
+ enum wined3d_material_color_source source)
+{
+ if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE))
+ return source;
+ if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR))
+ return source;
+ return WINED3D_MCS_MATERIAL;
+}
+
/* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */
#define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"
More information about the wine-cvs
mailing list