Henri Verbeet : wined3d: Get rid of the unused "streams" field from struct wined3d_vertex_declaration.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon May 27 09:22:50 2013 +0200

wined3d: Get rid of the unused "streams" field from struct wined3d_vertex_declaration.

---

dlls/wined3d/vertexdeclaration.c |    8 --------
 dlls/wined3d/wined3d_private.h   |    6 ++----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
index 13f4490..cf5378c 100644
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -164,7 +164,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara
         void *parent, const struct wined3d_parent_ops *parent_ops)
 {
     const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
-    WORD preloaded = 0; /* MAX_STREAMS, 16 */
     unsigned int i;

if (TRACE_ON(d3d_decl))
@@ -224,13 +223,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara
             return E_FAIL;
         }

-        if (!(preloaded & (1 << e->input_slot)))
-        {
-            declaration->streams[declaration->num_streams] = e->input_slot;
-            ++declaration->num_streams;
-            preloaded |= 1 << e->input_slot;
-        }
-
         if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT)
         {
             if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) declaration->half_float_conv_needed = TRUE;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e5ea47e..8d6f845 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2239,10 +2239,8 @@ struct wined3d_vertex_declaration
     struct wined3d_vertex_declaration_element *elements;
     UINT element_count;

-    DWORD                   streams[MAX_STREAMS];
-    UINT                    num_streams;
-    BOOL                    position_transformed;
-    BOOL                    half_float_conv_needed;
+    BOOL position_transformed;
+    BOOL half_float_conv_needed;
 };

struct wined3d_saved_states