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
ef4f0ebb
Commit
ef4f0ebb
authored
May 21, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
May 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to context_update_window().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6fcc5f11
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
context.c
dlls/wined3d/context.c
+15
-15
No files found.
dlls/wined3d/context.c
View file @
ef4f0ebb
...
...
@@ -1297,30 +1297,30 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD
}
}
static
void
context_update_window
(
struct
wined3d_context
*
context
)
static
void
wined3d_context_gl_update_window
(
struct
wined3d_context_gl
*
context_gl
)
{
if
(
!
context
->
swapchain
)
if
(
!
context
_gl
->
c
.
swapchain
)
return
;
if
(
context
->
win_handle
==
context
->
swapchain
->
win_handle
)
if
(
context
_gl
->
c
.
win_handle
==
context_gl
->
c
.
swapchain
->
win_handle
)
return
;
TRACE
(
"Updating context %p window from %p to %p.
\n
"
,
context
,
context
->
win_handle
,
context
->
swapchain
->
win_handle
);
context
_gl
,
context_gl
->
c
.
win_handle
,
context_gl
->
c
.
swapchain
->
win_handle
);
if
(
context
->
hdc
)
wined3d_release_dc
(
context
->
win_handle
,
context
->
hdc
);
if
(
context
_gl
->
c
.
hdc
)
wined3d_release_dc
(
context
_gl
->
c
.
win_handle
,
context_gl
->
c
.
hdc
);
context
->
win_handle
=
context
->
swapchain
->
win_handle
;
context
->
hdc_is_private
=
FALSE
;
context
->
hdc_has_format
=
FALSE
;
context
->
needs_set
=
1
;
context
->
valid
=
1
;
context
_gl
->
c
.
win_handle
=
context_gl
->
c
.
swapchain
->
win_handle
;
context
_gl
->
c
.
hdc_is_private
=
FALSE
;
context
_gl
->
c
.
hdc_has_format
=
FALSE
;
context
_gl
->
c
.
needs_set
=
1
;
context
_gl
->
c
.
valid
=
1
;
if
(
!
(
context
->
hdc
=
GetDCEx
(
context
->
win_handle
,
0
,
DCX_USESTYLE
|
DCX_CACHE
)))
if
(
!
(
context
_gl
->
c
.
hdc
=
GetDCEx
(
context_gl
->
c
.
win_handle
,
0
,
DCX_USESTYLE
|
DCX_CACHE
)))
{
ERR
(
"Failed to get a device context for window %p.
\n
"
,
context
->
win_handle
);
context
->
valid
=
0
;
ERR
(
"Failed to get a device context for window %p.
\n
"
,
context
_gl
->
c
.
win_handle
);
context
_gl
->
c
.
valid
=
0
;
}
}
...
...
@@ -4218,7 +4218,7 @@ static void context_activate(struct wined3d_context *context,
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl
(
context
);
context_enter
(
context
);
context_update_window
(
context
);
wined3d_context_gl_update_window
(
context_gl
);
context_setup_target
(
context
,
texture
,
sub_resource_idx
);
if
(
!
context
->
valid
)
return
;
...
...
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