Roderick Colenbrander : wined3d: Move video memory override to init_driver_info.
Alexandre Julliard
julliard at winehq.org
Mon Sep 13 17:14:44 CDT 2010
Module: wine
Branch: master
Commit: 4baf7a52f03f1c355238e472f769738d32da2a2d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4baf7a52f03f1c355238e472f769738d32da2a2d
Author: Roderick Colenbrander <thunderbird2k at gmail.com>
Date: Sat Sep 11 03:59:48 2010 +0200
wined3d: Move video memory override to init_driver_info.
---
dlls/wined3d/directx.c | 12 +++++++-----
dlls/wined3d/wined3d_main.c | 2 +-
dlls/wined3d/wined3d_private.h | 1 -
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ae61d9a..b6369bb 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1225,6 +1225,12 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
}
}
+ if (wined3d_settings.emulated_textureram)
+ {
+ TRACE_(d3d_caps)("Overriding amount of video memory with: %d byte\n", wined3d_settings.emulated_textureram);
+ driver_info->vidmem = wined3d_settings.emulated_textureram;
+ }
+
/* Try to obtain driver version information for the current Windows version. This fails in
* some cases:
* - the gpu is not available on the currently selected OS version:
@@ -5209,11 +5215,7 @@ static BOOL InitAdapters(IWineD3DImpl *This)
hdc = fake_gl_ctx.dc;
- /* Use the VideoRamSize registry setting when set */
- if(wined3d_settings.emulated_textureram)
- adapter->TextureRam = wined3d_settings.emulated_textureram;
- else
- adapter->TextureRam = adapter->driver_info.vidmem;
+ adapter->TextureRam = adapter->driver_info.vidmem;
adapter->UsedTextureRam = 0;
TRACE("Emulating %dMB of texture ram\n", adapter->TextureRam/(1024*1024));
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 2b06b36..6dea98a 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -70,7 +70,7 @@ wined3d_settings_t wined3d_settings =
RTL_READTEX, /* Default render target locking method */
PCI_VENDOR_NONE,/* PCI Vendor ID */
PCI_DEVICE_NONE,/* PCI Device ID */
- 0, /* The default of memory is set in FillGLCaps */
+ 0, /* The default of memory is set in init_driver_info */
NULL, /* No wine logo by default */
FALSE, /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */
FALSE, /* No strict draw ordering. */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index d8a765b..e152dc3 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1432,7 +1432,6 @@ struct wined3d_gl_limits
struct wined3d_gl_info
{
DWORD glsl_version;
- UINT vidmem;
struct wined3d_gl_limits limits;
DWORD reserved_glsl_constants;
DWORD quirks;
More information about the wine-cvs
mailing list