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

wined3d: Move video memory override to init_driver_info.

This commit is contained in:
Roderick Colenbrander 2010-09-11 03:59:48 +02:00 committed by Alexandre Julliard
parent 192e0dc433
commit 4baf7a52f0
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/wined3d/directx.c
View File

@ -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));

2
dlls/wined3d/wined3d_main.c
View File

@ -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. */

1
dlls/wined3d/wined3d_private.h
View File

@ -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;