Vitaliy Margolen : wined3d: Fix retrieval of driver adapter versions.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 6 04:51:08 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 46ecb15c5ccab9ce4802d20879dfc92b9fff3c91
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46ecb15c5ccab9ce4802d20879dfc92b9fff3c91
Author: Vitaliy Margolen <wine-patch at kievinfo.com>
Date: Sun Mar 5 13:07:44 2006 -0700
wined3d: Fix retrieval of driver adapter versions.
---
dlls/wined3d/directx.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 39c41bd..1749635 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1015,8 +1015,11 @@ HRESULT WINAPI IWineD3DImpl_GetAdapterId
reuse the values once we have a context which is valid. Values from
a temporary context may differ from the final ones */
if (isGLInfoValid == FALSE) {
+ WineD3D_Context *fake_ctx = NULL;
+ if (glXGetCurrentContext() == NULL) fake_ctx = WineD3D_CreateFakeGLContext();
/* If we don't know the device settings, go query them now */
isGLInfoValid = IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter));
+ if (fake_ctx != NULL) WineD3D_ReleaseFakeGLContext(fake_ctx);
}
/* If it worked, return the information requested */
More information about the wine-cvs
mailing list