Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_material().
Alexandre Julliard
julliard at winehq.org
Thu Oct 31 17:39:28 CDT 2019
Module: wine
Branch: master
Commit: 5072edde49b2a9a53974cf74adc5bbb396697a79
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5072edde49b2a9a53974cf74adc5bbb396697a79
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Oct 30 21:34:38 2019 -0500
wined3d: Introduce wined3d_stateblock_set_material().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/stateblock.c | 9 +++++++++
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 1 +
3 files changed, 11 insertions(+)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 98986c735b..24fd551adc 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1537,6 +1537,15 @@ HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *state
return S_OK;
}
+void CDECL wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock,
+ const struct wined3d_material *material)
+{
+ TRACE("stateblock %p, material %p.\n", stateblock, material);
+
+ stateblock->stateblock_state.material = *material;
+ stateblock->changed.material = TRUE;
+}
+
static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info)
{
union
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 43b6112714..4f3cdf9b7b 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -265,6 +265,7 @@
@ cdecl wined3d_stateblock_reset(ptr)
@ cdecl wined3d_stateblock_set_blend_factor(ptr ptr)
@ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr)
+@ cdecl wined3d_stateblock_set_material(ptr ptr)
@ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr)
@ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr)
@ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index fabcdcb0d7..27a0e58a28 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2670,6 +2670,7 @@ void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stat
const struct wined3d_color *blend_factor);
HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock,
UINT plane_idx, const struct wined3d_vec4 *plane);
+void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material);
void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);
HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock,
unsigned int start_idx, unsigned int count, const BOOL *constants);
More information about the wine-cvs
mailing list