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
d2e89d0b
Commit
d2e89d0b
authored
Mar 08, 2018
by
Matteo Bruni
Committed by
Alexandre Julliard
Mar 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context structure to texture2d_download_data().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
40d59088
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
surface.c
dlls/wined3d/surface.c
+3
-3
No files found.
dlls/wined3d/surface.c
View file @
d2e89d0b
...
...
@@ -561,9 +561,10 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win
* correct texture. */
/* Context activation is done by the caller. */
static
void
texture2d_download_data
(
struct
wined3d_texture
*
texture
,
unsigned
int
sub_resource_idx
,
const
struct
wined3d_
gl_info
*
gl_info
,
DWORD
dst_location
)
const
struct
wined3d_
context
*
context
,
DWORD
dst_location
)
{
const
struct
wined3d_format
*
format
=
texture
->
resource
.
format
;
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
struct
wined3d_texture_sub_resource
*
sub_resource
;
unsigned
int
dst_row_pitch
,
dst_slice_pitch
;
unsigned
int
src_row_pitch
,
src_slice_pitch
;
...
...
@@ -2070,7 +2071,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
BOOL
texture2d_load_sysmem
(
struct
wined3d_texture
*
texture
,
unsigned
int
sub_resource_idx
,
struct
wined3d_context
*
context
,
DWORD
dst_location
)
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
struct
wined3d_texture_sub_resource
*
sub_resource
;
sub_resource
=
&
texture
->
sub_resources
[
sub_resource_idx
];
...
...
@@ -2094,7 +2094,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res
{
wined3d_texture_bind_and_dirtify
(
texture
,
context
,
!
(
sub_resource
->
locations
&
WINED3D_LOCATION_TEXTURE_RGB
));
texture2d_download_data
(
texture
,
sub_resource_idx
,
gl_info
,
dst_location
);
texture2d_download_data
(
texture
,
sub_resource_idx
,
context
,
dst_location
);
++
texture
->
download_count
;
return
TRUE
;
...
...
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