ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Pass gl_info to volume_bind_and_dirtify().

This commit is contained in:
Henri Verbeet 2011-03-07 21:45:24 +01:00 committed by Alexandre Julliard
parent a46e0c617b
commit aa420ced0e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/wined3d/volume.c
View File

@ -27,9 +27,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
/* Context activation is done by the caller. */ /* 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; IWineD3DBaseTextureImpl *container = (IWineD3DBaseTextureImpl *)volume->container;
DWORD active_sampler; 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", TRACE("volume %p, level %u, srgb %#x, format %s (%#x).\n",
volume, level, srgb_mode, debug_d3dformat(format->id), format->id); volume, level, srgb_mode, debug_d3dformat(format->id), format->id);
volume_bind_and_dirtify(volume); volume_bind_and_dirtify(volume, gl_info);
ENTER_GL(); ENTER_GL();
GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, level, format->glInternal, GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, level, format->glInternal,