Signed-off-by: Henri Verbeet hverbeet@codeweavers.com --- 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 be03a1d01d1..65a1bb1fabe 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);