Henri Verbeet : wined3d: Get rid of the "numberedArraysLoaded" field in struct wined3d_context.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 70c5dc64fc02408c6f7233c996e0ffdc5dc4a5a0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=70c5dc64fc02408c6f7233c99...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Apr 16 18:17:30 2018 +0430

wined3d: Get rid of the "numberedArraysLoaded" field in struct wined3d_context.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 5a37fad..5bcd244 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4346,10 +4346,9 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat
             && !use_vs(state) && !context->use_immediate_mode_draw;
 
     if (isStateDirty(context, STATE_VDECL)) return;
-    if (context->numberedArraysLoaded && !load_numbered)
+    if (context->numbered_array_mask && !load_numbered)
     {
         unload_numbered_arrays(context);
-        context->numberedArraysLoaded = FALSE;
         context->numbered_array_mask = 0;
     }
     else if (context->namedArraysLoaded)
@@ -4362,7 +4361,6 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat
     {
         TRACE("Loading numbered arrays\n");
         load_numbered_arrays(context, &context->stream_info, state);
-        context->numberedArraysLoaded = TRUE;
     }
     else if (load_named)
     {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 24d9232..7e6a87f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1883,7 +1883,7 @@ struct wined3d_context
     DWORD last_was_vshader : 1;
     DWORD last_was_normal : 1;
     DWORD namedArraysLoaded : 1;
-    DWORD numberedArraysLoaded : 1;
+    DWORD last_was_ffp_blit : 1;
     DWORD last_was_blit : 1;
     DWORD last_was_ckey : 1;
     DWORD fog_coord : 1;
@@ -1892,6 +1892,7 @@ struct wined3d_context
     DWORD current : 1;
     DWORD destroyed : 1;
     DWORD valid : 1;
+
     DWORD texShaderBumpMap : 8;         /* MAX_TEXTURES, 8 */
     DWORD lastWasPow2Texture : 8;       /* MAX_TEXTURES, 8 */
     DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */
@@ -1900,6 +1901,7 @@ struct wined3d_context
     DWORD rebind_fbo : 1;
     DWORD needs_set : 1;
     DWORD hdc_is_private : 1;
+
     DWORD hdc_has_format : 1;           /* only meaningful if hdc_is_private */
     DWORD update_shader_resource_bindings : 1;
     DWORD update_compute_shader_resource_bindings : 1;
@@ -1911,11 +1913,10 @@ struct wined3d_context
     DWORD transform_feedback_paused : 1;
     DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */
     DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */
-    DWORD last_was_ffp_blit : 1;
-    DWORD padding : 8;
+    DWORD padding : 9;
 
     DWORD constant_update_mask;
-    DWORD                   numbered_array_mask;
+    DWORD numbered_array_mask;
     GLenum                  tracking_parm;     /* Which source is tracking current colour         */
     GLenum                  untracked_materials[2];
     UINT                    blit_w, blit_h;