Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_unit_free_for_vs().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu May  9 23:56:23 2019 +0430

wined3d: Pass a wined3d_context_gl structure to context_unit_free_for_vs().

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

---

 dlls/wined3d/context.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index e6b4503..a197604 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3365,10 +3365,10 @@ static void wined3d_context_gl_map_psamplers(struct wined3d_context_gl *context_
     }
 }
 
-static BOOL context_unit_free_for_vs(const struct wined3d_context *context,
-        const struct wined3d_shader_resource_info *ps_resource_info, DWORD unit)
+static BOOL wined3d_context_gl_unit_free_for_vs(const struct wined3d_context_gl *context_gl,
+        const struct wined3d_shader_resource_info *ps_resource_info, unsigned int unit)
 {
-    DWORD current_mapping = context->rev_tex_unit_map[unit];
+    unsigned int current_mapping = context_gl->c.rev_tex_unit_map[unit];
 
     /* Not currently used */
     if (current_mapping == WINED3D_UNMAPPED_STAGE)
@@ -3381,7 +3381,8 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context,
         if (!ps_resource_info)
         {
             /* No pixel shader, check fixed function */
-            return current_mapping >= WINED3D_MAX_TEXTURES || !(context->fixed_function_usage_map & (1u << current_mapping));
+            return current_mapping >= WINED3D_MAX_TEXTURES
+                    || !(context_gl->c.fixed_function_usage_map & (1u << current_mapping));
         }
 
         /* Pixel shader, check the shader's sampler map */
@@ -3414,7 +3415,7 @@ static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_
         {
             while (start >= 0)
             {
-                if (context_unit_free_for_vs(&context_gl->c, ps_resource_info, start))
+                if (wined3d_context_gl_unit_free_for_vs(context_gl, ps_resource_info, start))
                 {
                     if (context_gl->c.tex_unit_map[vsampler_idx] != start)
                     {