=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Pass context to find_arb_pshader().

Alexandre Julliard julliard at winehq.org
Tue Aug 21 16:49:03 CDT 2018


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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Aug 21 10:24:27 2018 +0200

wined3d: Pass context to find_arb_pshader().

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/arb_program_shader.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 7cd7d2d..67fd193 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4230,12 +4230,12 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader,
 }
 
 /* Context activation is done by the caller. */
-static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *shader,
-        const struct arb_ps_compile_args *args)
+static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context *context,
+        struct wined3d_shader *shader, const struct arb_ps_compile_args *args)
 {
+    const struct wined3d_d3d_info *d3d_info = context->d3d_info;
+    const struct wined3d_gl_info *gl_info = context->gl_info;
     struct wined3d_device *device = shader->device;
-    const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
-    const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info;
     UINT i;
     DWORD new_size;
     struct arb_ps_compiled_shader *new_array;
@@ -4566,7 +4566,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context
 
         TRACE("Using pixel shader %p.\n", ps);
         find_arb_ps_compile_args(state, context, ps, &compile_args);
-        compiled = find_arb_pshader(ps, &compile_args);
+        compiled = find_arb_pshader(context, ps, &compile_args);
         priv->current_fprogram_id = compiled->prgId;
         priv->compiled_fprog = compiled;
 




More information about the wine-cvs mailing list