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

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Tue Jun 11 01:03:29 2019 +0430

wined3d: Pass a wined3d_context_gl structure to context_unload_tex_coords().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

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

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 01d350d..be24baf 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -5015,9 +5015,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
     context_release(context);
 }

-void context_unload_tex_coords(const struct wined3d_context *context)
+void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl)
 {
-    const struct wined3d_gl_info *gl_info = context->gl_info;
+    const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
     unsigned int texture_idx;

for (texture_idx = 0; texture_idx < gl_info->limits.texture_coords; ++texture_idx)
@@ -5091,6 +5091,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context
 /* This should match any arrays loaded in context_load_vertex_data(). */
 static void context_unload_vertex_data(struct wined3d_context *context)
 {
+    struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
     const struct wined3d_gl_info *gl_info = context->gl_info;

if (!context->namedArraysLoaded)
@@ -5100,7 +5101,7 @@ static void context_unload_vertex_data(struct wined3d_context *context)
     gl_info->gl_ops.gl.p_glDisableClientState(GL_COLOR_ARRAY);
     if (gl_info->supported[EXT_SECONDARY_COLOR])
         gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT);
-    context_unload_tex_coords(context);
+    wined3d_context_gl_unload_tex_coords(context_gl);
     context->namedArraysLoaded = FALSE;
 }

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index a31f085..1e13557 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3474,7 +3474,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d
          */
         GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0;

-        context_unload_tex_coords(context);
+        wined3d_context_gl_unload_tex_coords(context_gl);
         wined3d_context_gl_load_tex_coords(context_gl, &context->stream_info, &curVBO, state);
     }
 }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0dd1fc1..4f0b91a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2111,6 +2111,7 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_
 void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN;
 void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl,
         const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN;
+void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;
 void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl,
         const struct wined3d_state *state) DECLSPEC_HIDDEN;

@@ -2268,7 +2269,6 @@ void context_state_drawbuf(struct wined3d_context *context,
         const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
 void context_state_fb(struct wined3d_context *context,
         const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;
-void context_unload_tex_coords(const struct wined3d_context *context) DECLSPEC_HIDDEN;
 void context_unmap_bo_address(struct wined3d_context *context,
         const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN;