Henri Verbeet : wined3d: Set the volume.c GLINFO_LOCATION to *gl_info.
Alexandre Julliard
julliard at winehq.org
Mon May 24 11:30:50 CDT 2010
Module: wine
Branch: master
Commit: 08c783a8ade5991a30357f4bb7a44b541ae71d6e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c783a8ade5991a30357f4bb7a44b541ae71d6e
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon May 24 09:56:36 2010 +0200
wined3d: Set the volume.c GLINFO_LOCATION to *gl_info.
---
dlls/wined3d/volume.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index b53f4d3..693ddd1 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -25,7 +25,8 @@
#include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
-#define GLINFO_LOCATION This->resource.device->adapter->gl_info
+
+#define GLINFO_LOCATION (*gl_info)
/* Context activation is done by the caller. */
static void volume_bind_and_dirtify(IWineD3DVolume *iface) {
@@ -313,8 +314,10 @@ static HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWi
}
/* Context activation is done by the caller. */
-static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) {
- IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
+static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode)
+{
+ IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
+ const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info;
const struct wined3d_format_desc *glDesc = This->resource.format_desc;
TRACE("(%p) : level %u, format %s (0x%08x)\n", This, gl_level, debug_d3dformat(glDesc->format), glDesc->format);
More information about the wine-cvs
mailing list