Matteo Bruni : wined3d: Pass a wined3d_context structure to texture2d_download_data().

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Thu Mar  8 10:53:04 2018 +0330

wined3d: Pass a wined3d_context structure to texture2d_download_data().

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

---

 dlls/wined3d/surface.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 12023e2..35aee73 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -561,9 +561,10 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win
  * correct texture. */
 /* Context activation is done by the caller. */
 static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
-        const struct wined3d_gl_info *gl_info, DWORD dst_location)
+        const struct wined3d_context *context, DWORD dst_location)
 {
     const struct wined3d_format *format = texture->resource.format;
+    const struct wined3d_gl_info *gl_info = context->gl_info;
     struct wined3d_texture_sub_resource *sub_resource;
     unsigned int dst_row_pitch, dst_slice_pitch;
     unsigned int src_row_pitch, src_slice_pitch;
@@ -2070,7 +2071,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
 BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx,
         struct wined3d_context *context, DWORD dst_location)
 {
-    const struct wined3d_gl_info *gl_info = context->gl_info;
     struct wined3d_texture_sub_resource *sub_resource;
 
     sub_resource = &texture->sub_resources[sub_resource_idx];
@@ -2094,7 +2094,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res
         {
             wined3d_texture_bind_and_dirtify(texture, context,
                     !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB));
-            texture2d_download_data(texture, sub_resource_idx, gl_info, dst_location);
+            texture2d_download_data(texture, sub_resource_idx, context, dst_location);
             ++texture->download_count;
 
             return TRUE;