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

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Fri Aug  2 03:50:11 2019 +0430

wined3d: Pass a wined3d_context_gl structure to wined3d_shader_resource_view_gl_bind().

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

---

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

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 32cbc02..fb39339 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3809,7 +3809,7 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *
             sampler = device->default_sampler;
         else if (!(sampler = state->sampler[shader_type][entry->sampler_idx]))
             sampler = device->null_sampler;
-        wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, &context_gl->c);
+        wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context_gl);
     }
 }
 
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 7962496..d26ff6e 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -828,10 +828,9 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc
 }
 
 void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl,
-        unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context)
+        unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl)
 {
-    struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
-    const struct wined3d_gl_info *gl_info = context->gl_info;
+    const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
     struct wined3d_texture_gl *texture_gl;
 
     wined3d_context_gl_active_texture(context_gl, gl_info, unit);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index ae46b4a..c7d9cd7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4137,7 +4137,7 @@ static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_vi
 }
 
 void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit,
-        struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN;
+        struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;
 
 struct wined3d_unordered_access_view
 {