Henri Verbeet : wined3d: Apply PCI ID overrides in init_driver_info() instead of IWineD3DImpl_GetAdapterIdentifier().
Alexandre Julliard
julliard at winehq.org
Tue Oct 27 09:46:31 CDT 2009
Module: wine
Branch: master
Commit: 26ba2124079aa5f990d5839704d089329f422936
URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ba2124079aa5f990d5839704d089329f422936
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Oct 27 10:10:40 2009 +0100
wined3d: Apply PCI ID overrides in init_driver_info() instead of IWineD3DImpl_GetAdapterIdentifier().
---
dlls/wined3d/directx.c | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 2367187..9c4fbea 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -979,8 +979,20 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
{
unsigned int i;
+ if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE)
+ {
+ TRACE_(d3d_caps)("Overriding PCI vendor ID with: %04x\n", wined3d_settings.pci_vendor_id);
+ vendor = wined3d_settings.pci_vendor_id;
+ }
driver_info->vendor = vendor;
+
+ if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE)
+ {
+ TRACE_(d3d_caps)("Overriding PCI device ID with: %04x\n", wined3d_settings.pci_device_id);
+ device = wined3d_settings.pci_device_id;
+ }
driver_info->device = device;
+
driver_info->name = "Display";
driver_info->description = "Direct3D HAL";
driver_info->version_high = MAKEDWORD_VERSION(7, 1);
@@ -2352,19 +2364,6 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad
pIdentifier->subsystem_id = 0;
pIdentifier->revision = 0;
memcpy(&pIdentifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(pIdentifier->device_identifier));
-
- if(wined3d_settings.pci_device_id != PCI_DEVICE_NONE)
- {
- TRACE_(d3d_caps)("Overriding pci device id with: %x\n", wined3d_settings.pci_device_id);
- pIdentifier->device_id = wined3d_settings.pci_device_id;
- }
-
- if(wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE)
- {
- TRACE_(d3d_caps)("Overriding pci vendor id with: %x\n", wined3d_settings.pci_vendor_id);
- pIdentifier->vendor_id = wined3d_settings.pci_vendor_id;
- }
-
pIdentifier->whql_level = (Flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1;
return WINED3D_OK;
More information about the wine-cvs
mailing list