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
576a74d1
Commit
576a74d1
authored
Mar 19, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get resource info from the texture in surface_load_fb_texture().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1e8befdb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
surface.c
dlls/wined3d/surface.c
+5
-4
No files found.
dlls/wined3d/surface.c
View file @
576a74d1
...
...
@@ -2110,7 +2110,8 @@ error:
* switch to a different context and restore the original one before return. */
void
surface_load_fb_texture
(
struct
wined3d_surface
*
surface
,
BOOL
srgb
,
struct
wined3d_context
*
old_ctx
)
{
struct
wined3d_device
*
device
=
surface
->
resource
.
device
;
struct
wined3d_texture
*
texture
=
surface
->
container
;
struct
wined3d_device
*
device
=
texture
->
resource
.
device
;
const
struct
wined3d_gl_info
*
gl_info
;
struct
wined3d_context
*
context
=
old_ctx
;
struct
wined3d_surface
*
restore_rt
=
NULL
;
...
...
@@ -2124,12 +2125,12 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct
gl_info
=
context
->
gl_info
;
device_invalidate_state
(
device
,
STATE_FRAMEBUFFER
);
wined3d_texture_prepare_texture
(
surface
->
container
,
context
,
srgb
);
wined3d_texture_bind_and_dirtify
(
surface
->
container
,
context
,
srgb
);
wined3d_texture_prepare_texture
(
texture
,
context
,
srgb
);
wined3d_texture_bind_and_dirtify
(
texture
,
context
,
srgb
);
TRACE
(
"Reading back offscreen render target %p.
\n
"
,
surface
);
if
(
wined3d_resource_is_offscreen
(
&
surface
->
container
->
resource
))
if
(
wined3d_resource_is_offscreen
(
&
texture
->
resource
))
gl_info
->
gl_ops
.
gl
.
p_glReadBuffer
(
context_get_offscreen_gl_buffer
(
context
));
else
gl_info
->
gl_ops
.
gl
.
p_glReadBuffer
(
surface_get_gl_buffer
(
surface
));
...
...
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