Henri Verbeet : wined3d: Explicitly pass gl_info to gen_arbfp_ffp_shader().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d1b650e9595d0d5aa7c1887c139d620d198de7ab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d1b650e9595d0d5aa7c1887c13...

Author: Henri Verbeet 
Date:   Mon Jul 11 22:04:30 2011 +0200

wined3d: Explicitly pass gl_info to gen_arbfp_ffp_shader().

---

dlls/wined3d/arb_program_shader.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 66f1695..aef4fab 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5952,9 +5952,8 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta
     }
 }

-static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, struct wined3d_stateblock *stateblock)
+static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info)
 {
-    const struct wined3d_gl_info *gl_info = &stateblock->device->adapter->gl_info;
     unsigned int stage;
     struct wined3d_shader_buffer buffer;
     BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};
@@ -6280,7 +6279,7 @@ static void fragment_prog_arbfp(DWORD state_id, struct wined3d_stateblock *state
             }

memcpy(&new_desc->parent.settings, &settings, sizeof(settings));
-            new_desc->shader = gen_arbfp_ffp_shader(&settings, stateblock);
+            new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info);
             add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent);
             TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc);
             desc = new_desc;