Henri Verbeet : wined3d: Get rid of the mostly unused blockType field in struct wined3d_stateblock.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Wed Jan 18 21:46:18 2012 +0100

wined3d: Get rid of the mostly unused blockType field in struct wined3d_stateblock.

---

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

diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index b00fb84..304a326 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -924,8 +924,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo
     unsigned int i;
     DWORD map;

-    TRACE("Applying stateblock %p of type %#x to device %p.\n",
-            stateblock, stateblock->blockType, device);
+    TRACE("Applying stateblock %p to device %p.\n", stateblock, device);

if (stateblock->changed.vertexShader)
         wined3d_device_set_vertex_shader(device, stateblock->state.vertex_shader);
@@ -1105,8 +1104,6 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)

TRACE("stateblock %p.\n", stateblock);

-    stateblock->blockType = WINED3D_SBT_INIT;
-
     memset(stateblock->changed.pixelShaderConstantsF, 0, device->d3d_pshader_constantF * sizeof(BOOL));
     memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL));

@@ -1344,7 +1341,6 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,

stateblock->ref = 1;
     stateblock->device = device;
-    stateblock->blockType = type;

for (i = 0; i < LIGHTMAP_SIZE; i++)
     {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c9d1208..5ca9d23 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2310,7 +2310,6 @@ struct wined3d_stateblock
 {
     LONG                      ref;     /* Note: Ref counting not required */
     struct wined3d_device *device;
-    enum wined3d_stateblock_type blockType;

/* Array indicating whether things have been set or changed */
     struct wined3d_saved_states changed;