Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
8e537aa7
Commit
8e537aa7
authored
Aug 16, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Set a LUID for WINED3D_NO3D adapters as well.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b96a6771
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
directx.c
dlls/wined3d/directx.c
+8
-8
No files found.
dlls/wined3d/directx.c
View file @
8e537aa7
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment