Henri Verbeet : wined3d: Get rid of the SAVEDSTATES typedef.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4c727ed0a1464a2200fb1746e0f564916edbc572
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c727ed0a1464a2200fb1746e0...

Author: Henri Verbeet 
Date:   Mon Nov  7 21:20:01 2011 +0100

wined3d: Get rid of the SAVEDSTATES typedef.

---

dlls/wined3d/stateblock.c      |    6 +++---
 dlls/wined3d/wined3d_private.h |   10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index f9a2812..e122165 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -241,7 +241,7 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size)
 }

/* Set all members of a stateblock savedstate to the given value */
-static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts, DWORD ps_consts)
+static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, DWORD vs_consts, DWORD ps_consts)
 {
     unsigned int i;

@@ -274,7 +274,7 @@ static void stateblock_savedstates_set_all(SAVEDSTATES *states, DWORD vs_consts,
     memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * vs_consts);
 }

-static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const DWORD num_constants)
+static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states, const DWORD num_constants)
 {
     DWORD texture_mask = 0;
     WORD sampler_mask = 0;
@@ -300,7 +300,7 @@ static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const DWORD nu
     memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * num_constants);
 }

-static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const DWORD num_constants)
+static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *states, const DWORD num_constants)
 {
     DWORD texture_mask = 0;
     WORD sampler_mask = 0;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b5b335f..14fbd2b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2205,10 +2205,8 @@ struct wined3d_vertex_declaration
     BOOL                    half_float_conv_needed;
 };

-/* Internal state Block for Begin/End/Capture/Create/Apply info  */
-/*   Note: Very long winded but gl Lists are not flexible enough */
-/*   to resolve everything we need, so doing it manually for now */
-typedef struct SAVEDSTATES {
+struct wined3d_saved_states
+{
     DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1];
     WORD streamSource;                          /* MAX_STREAMS, 16 */
     WORD streamFreq;                            /* MAX_STREAMS, 16 */
@@ -2232,7 +2230,7 @@ typedef struct SAVEDSTATES {
     DWORD vertexShader : 1;
     DWORD scissorRect : 1;
     DWORD padding : 4;
-} SAVEDSTATES;
+};

struct StageState {
     DWORD stage;
@@ -2298,7 +2296,7 @@ struct wined3d_stateblock
     WINED3DSTATEBLOCKTYPE     blockType;

/* Array indicating whether things have been set or changed */
-    SAVEDSTATES               changed;
+    struct wined3d_saved_states changed;
     struct wined3d_state state;

/* Contained state management */