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
aaa431d8
Commit
aaa431d8
authored
Mar 07, 2017
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use wined3d_texture_blt() in surface_upload_from_surface().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
71a07330
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
surface.c
dlls/wined3d/surface.c
+3
-2
No files found.
dlls/wined3d/surface.c
View file @
aaa431d8
...
...
@@ -1098,9 +1098,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
return
WINED3DERR_INVALIDCALL
;
}
/* Use wined3d_
surfac
e_blt() instead of uploading directly if we need conversion. */
/* Use wined3d_
textur
e_blt() instead of uploading directly if we need conversion. */
if
(
dst_format
->
convert
||
wined3d_format_get_color_key_conversion
(
dst_texture
,
FALSE
))
return
wined3d_surface_blt
(
dst_surface
,
&
dst_rect
,
src_surface
,
src_rect
,
0
,
NULL
,
WINED3D_TEXF_POINT
);
return
wined3d_texture_blt
(
dst_texture
,
dst_sub_resource_idx
,
&
dst_rect
,
src_texture
,
src_sub_resource_idx
,
src_rect
,
0
,
NULL
,
WINED3D_TEXF_POINT
);
context
=
context_acquire
(
dst_texture
->
resource
.
device
,
NULL
,
0
);
gl_info
=
context
->
gl_info
;
...
...
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