Henri Verbeet : wined3d: Explicitly pass blit_priv and gl_info to gen_p8_shader().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Dec  9 23:41:17 2010 +0100

wined3d: Explicitly pass blit_priv and gl_info to gen_p8_shader().

---

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

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 397ad87..2b4004a 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -6771,12 +6771,11 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype,
     return TRUE;
 }
 
-static GLuint gen_p8_shader(IWineD3DDeviceImpl *device, GLenum textype)
+static GLuint gen_p8_shader(struct arbfp_blit_priv *priv,
+        const struct wined3d_gl_info *gl_info, GLenum textype)
 {
-    const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
     GLenum shader;
     struct wined3d_shader_buffer buffer;
-    struct arbfp_blit_priv *priv = device->blit_priv;
     GLint pos;
 
     /* Shader header */
@@ -7068,7 +7067,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac
 
         case COMPLEX_FIXUP_P8:
             shader = textype == GL_TEXTURE_RECTANGLE_ARB ? priv->p8_rect_shader : priv->p8_2d_shader;
-            if (!shader) shader = gen_p8_shader(device, textype);
+            if (!shader) shader = gen_p8_shader(priv, gl_info, textype);
 
             upload_palette(surface);
             break;