Henri Verbeet : wined3d: Pass gl_info to volume_bind_and_dirtify().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon Mar  7 21:45:24 2011 +0100

wined3d: Pass gl_info to volume_bind_and_dirtify().

---

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

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 03bc5e6..e6f7687 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -27,9 +27,8 @@
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);

/* Context activation is done by the caller. */
-static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume)
+static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume, const struct wined3d_gl_info *gl_info)
 {
-    const struct wined3d_gl_info *gl_info = &volume->resource.device->adapter->gl_info;
     IWineD3DBaseTextureImpl *container = (IWineD3DBaseTextureImpl *)volume->container;
     DWORD active_sampler;

@@ -102,7 +101,7 @@ void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode)
     TRACE("volume %p, level %u, srgb %#x, format %s (%#x).\n",
             volume, level, srgb_mode, debug_d3dformat(format->id), format->id);

-    volume_bind_and_dirtify(volume);
+    volume_bind_and_dirtify(volume, gl_info);

ENTER_GL();
     GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, level, format->glInternal,