Henri Verbeet : wined3d: Set a LUID for WINED3D_NO3D adapters as well.
Alexandre Julliard
julliard at winehq.org
Thu Aug 16 13:42:48 CDT 2018
Module: wine
Branch: master
Commit: 8e537aa709e45bd6d238ae41814721068ad4d626
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e537aa709e45bd6d238ae41814721068ad4d626
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Aug 16 12:27:22 2018 +0430
wined3d: Set a LUID for WINED3D_NO3D adapters as well.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/directx.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index be03a1d..65a1bb1 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -6641,14 +6641,6 @@ static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD w
glEnableWINE = gl_info->gl_ops.gl.p_glEnable;
glDisableWINE = gl_info->gl_ops.gl.p_glDisable;
- if (!AllocateLocallyUniqueId(&adapter->luid))
- {
- ERR("Failed to set adapter LUID (%#x).\n", GetLastError());
- return FALSE;
- }
- TRACE("Allocated LUID %08x:%08x for adapter %p.\n",
- adapter->luid.HighPart, adapter->luid.LowPart, adapter);
-
if (!wined3d_caps_gl_ctx_create(adapter, &caps_gl_ctx))
{
ERR("Failed to get a GL context for adapter %p.\n", adapter);
@@ -6752,6 +6744,14 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o
TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName));
strcpyW(adapter->DeviceName, display_device.DeviceName);
+ if (!AllocateLocallyUniqueId(&adapter->luid))
+ {
+ ERR("Failed to set adapter LUID (%#x).\n", GetLastError());
+ return FALSE;
+ }
+ TRACE("Allocated LUID %08x:%08x for adapter %p.\n",
+ adapter->luid.HighPart, adapter->luid.LowPart, adapter);
+
if (wined3d_creation_flags & WINED3D_NO3D)
return wined3d_adapter_no3d_init(adapter);
return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags);
More information about the wine-cvs
mailing list