Zebediah Figura : wined3d: Get rid of the "state" field from struct wined3d_stateblock.
Alexandre Julliard
julliard at winehq.org
Fri Feb 15 14:37:02 CST 2019
Module: wine
Branch: master
Commit: c19a798003e5585407f6aba77e325001d62202c5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19a798003e5585407f6aba77e325001d62202c5
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Feb 15 00:38:13 2019 -0600
wined3d: Get rid of the "state" field from struct wined3d_stateblock.
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 | 2 --
dlls/wined3d/wined3d_private.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index cd57e6c..cd72209 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -604,7 +604,6 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock)
if (!refcount)
{
- state_cleanup(&stateblock->state);
wined3d_stateblock_state_cleanup(&stateblock->stateblock_state);
heap_free(stateblock);
}
@@ -1557,7 +1556,6 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,
stateblock->ref = 1;
stateblock->device = device;
- state_init(&stateblock->state, NULL, d3d_info, 0);
wined3d_stateblock_state_init(&stateblock->stateblock_state, device, 0);
if (type == WINED3D_SBT_RECORDED)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index fbde36c..57df9f1 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3604,7 +3604,6 @@ struct wined3d_stateblock
/* Array indicating whether things have been set or changed */
struct wined3d_saved_states changed;
- struct wined3d_state state;
struct wined3d_stateblock_state stateblock_state;
/* Contained state management */
More information about the wine-cvs
mailing list