Stefan Dösinger : wined3d: Store the adapter driver and description in the adapter.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 11 08:46:24 CDT 2007
Module: wine
Branch: master
Commit: 66930554d1cb5256a2e8d32cbb9259ed9aba59ab
URL: http://source.winehq.org/git/wine.git/?a=commit;h=66930554d1cb5256a2e8d32cbb9259ed9aba59ab
Author: Stefan Dösinger <stefandoesinger at gmx.at>
Date: Fri Jun 8 15:23:04 2007 +0200
wined3d: Store the adapter driver and description in the adapter.
---
dlls/wined3d/directx.c | 6 ++++--
dlls/wined3d/wined3d_private.h | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index c981528..8d15f7e 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1316,8 +1316,8 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad
/* Return the information requested */
TRACE_(d3d_caps)("device/Vendor Name and Version detection using FillGLCaps\n");
- strcpy(pIdentifier->Driver, "Display");
- strcpy(pIdentifier->Description, "Direct3D HAL");
+ strcpy(pIdentifier->Driver, Adapters[Adapter].driver);
+ strcpy(pIdentifier->Description, Adapters[Adapter].description);
/* Note dx8 doesn't supply a DeviceName */
if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */
@@ -2621,6 +2621,8 @@ BOOL InitAdapters(void) {
HeapFree(GetProcessHeap(), 0, Adapters);
return FALSE;
}
+ Adapters[0].driver = "Display";
+ Adapters[0].description = "Direct3D HAL";
}
numAdapters = 1;
TRACE("%d adapters successfully initialized\n", numAdapters);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index fdb2cbb..be37ec1 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -577,6 +577,8 @@ struct WineD3DAdapter
POINT monitorPoint;
Display *display;
WineD3D_GL_Info gl_info;
+ const char *driver;
+ const char *description;
};
extern BOOL InitAdapters(void);
More information about the wine-cvs
mailing list