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
7d3eda57
Commit
7d3eda57
authored
Jun 03, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to context_activate().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4a9d8fed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
10 deletions
+9
-10
context.c
dlls/wined3d/context.c
+9
-10
No files found.
dlls/wined3d/context.c
View file @
7d3eda57
...
...
@@ -4211,23 +4211,21 @@ static void context_setup_target(struct wined3d_context *context,
context_set_render_offscreen
(
context
,
render_offscreen
);
}
static
void
context_activate
(
struct
wined3d_context
*
context
,
static
void
wined3d_context_gl_activate
(
struct
wined3d_context_gl
*
context_gl
,
struct
wined3d_texture
*
texture
,
unsigned
int
sub_resource_idx
)
{
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl
(
context
);
wined3d_context_gl_enter
(
context_gl
);
wined3d_context_gl_update_window
(
context_gl
);
context_setup_target
(
context
,
texture
,
sub_resource_idx
);
if
(
!
context
->
valid
)
context_setup_target
(
&
context_gl
->
c
,
texture
,
sub_resource_idx
);
if
(
!
context
_gl
->
c
.
valid
)
return
;
if
(
context
!=
context_get_current
())
if
(
&
context_gl
->
c
!=
context_get_current
())
{
if
(
!
context_set_current
(
context
))
if
(
!
context_set_current
(
&
context_gl
->
c
))
ERR
(
"Failed to activate the new context.
\n
"
);
}
else
if
(
context
->
needs_set
)
else
if
(
context
_gl
->
c
.
needs_set
)
{
wined3d_context_gl_set_gl_context
(
context_gl
);
}
...
...
@@ -4292,7 +4290,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device,
return
NULL
;
}
context_activate
(
context
,
texture
,
sub_resource_idx
);
wined3d_context_gl_activate
(
wined3d_context_gl
(
context
)
,
texture
,
sub_resource_idx
);
return
context
;
}
...
...
@@ -4309,7 +4307,8 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device,
if
(
context
->
current_rt
.
texture
)
{
context_activate
(
context
,
context
->
current_rt
.
texture
,
context
->
current_rt
.
sub_resource_idx
);
wined3d_context_gl_activate
(
wined3d_context_gl
(
context
),
context
->
current_rt
.
texture
,
context
->
current_rt
.
sub_resource_idx
);
return
context
;
}
...
...
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