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
d6e7f18c
Commit
d6e7f18c
authored
Jan 28, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 29, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Use wined3d_texture_blt() in ddraw_surface7_BltFast().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ce882bd6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
ddraw.c
dlls/ddraw/ddraw.c
+1
-1
ddraw_private.h
dlls/ddraw/ddraw_private.h
+3
-1
surface.c
dlls/ddraw/surface.c
+5
-3
No files found.
dlls/ddraw/ddraw.c
View file @
d6e7f18c
...
...
@@ -4765,7 +4765,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
return
DDERR_OUTOFVIDEOMEMORY
;
}
ddraw_surface_init
(
ddraw_surface
,
ddraw
,
wined3d_texture
,
surface
,
parent_ops
);
ddraw_surface_init
(
ddraw_surface
,
ddraw
,
wined3d_texture
,
su
b_resource_idx
,
su
rface
,
parent_ops
);
*
parent
=
ddraw_surface
;
ddraw_update_lost_surfaces
(
ddraw
);
...
...
dlls/ddraw/ddraw_private.h
View file @
d6e7f18c
...
...
@@ -163,6 +163,7 @@ struct ddraw_surface
struct
ddraw
*
ddraw
;
struct
wined3d_surface
*
wined3d_surface
;
struct
wined3d_texture
*
wined3d_texture
;
unsigned
int
sub_resource_idx
;
struct
wined3d_rendertarget_view
*
wined3d_rtv
;
struct
wined3d_private_store
private_store
;
struct
d3d_device
*
device1
;
...
...
@@ -209,7 +210,8 @@ struct ddraw_texture
HRESULT
ddraw_surface_create
(
struct
ddraw
*
ddraw
,
const
DDSURFACEDESC2
*
surface_desc
,
struct
ddraw_surface
**
surface
,
IUnknown
*
outer_unknown
,
unsigned
int
version
)
DECLSPEC_HIDDEN
;
struct
wined3d_rendertarget_view
*
ddraw_surface_get_rendertarget_view
(
struct
ddraw_surface
*
surface
)
DECLSPEC_HIDDEN
;
void
ddraw_surface_init
(
struct
ddraw_surface
*
surface
,
struct
ddraw
*
ddraw
,
struct
wined3d_texture
*
wined3d_texture
,
void
ddraw_surface_init
(
struct
ddraw_surface
*
surface
,
struct
ddraw
*
ddraw
,
struct
wined3d_texture
*
wined3d_texture
,
unsigned
int
sub_resource_idx
,
struct
wined3d_surface
*
wined3d_surface
,
const
struct
wined3d_parent_ops
**
parent_ops
)
DECLSPEC_HIDDEN
;
ULONG
ddraw_surface_release_iface
(
struct
ddraw_surface
*
This
)
DECLSPEC_HIDDEN
;
HRESULT
ddraw_surface_update_frontbuffer
(
struct
ddraw_surface
*
surface
,
...
...
dlls/ddraw/surface.c
View file @
d6e7f18c
...
...
@@ -4132,8 +4132,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac
if
(
src_impl
->
surface_desc
.
ddsCaps
.
dwCaps
&
DDSCAPS_PRIMARYSURFACE
)
hr
=
ddraw_surface_update_frontbuffer
(
src_impl
,
src_rect
,
TRUE
);
if
(
SUCCEEDED
(
hr
))
hr
=
wined3d_
surface_blt
(
dst_impl
->
wined3d_surface
,
&
dst_rect
,
src_impl
->
wined3d_
surface
,
src_rect
,
flags
,
NULL
,
WINED3D_TEXF_POINT
);
hr
=
wined3d_
texture_blt
(
dst_impl
->
wined3d_texture
,
dst_impl
->
sub_resource_idx
,
&
dst_rect
,
src_impl
->
wined3d_
texture
,
src_impl
->
sub_resource_idx
,
src_rect
,
flags
,
NULL
,
WINED3D_TEXF_POINT
);
if
(
SUCCEEDED
(
hr
)
&&
(
dst_impl
->
surface_desc
.
ddsCaps
.
dwCaps
&
DDSCAPS_PRIMARYSURFACE
))
hr
=
ddraw_surface_update_frontbuffer
(
dst_impl
,
&
dst_rect
,
FALSE
);
wined3d_mutex_unlock
();
...
...
@@ -6215,7 +6215,8 @@ fail:
return
hr
;
}
void
ddraw_surface_init
(
struct
ddraw_surface
*
surface
,
struct
ddraw
*
ddraw
,
struct
wined3d_texture
*
wined3d_texture
,
void
ddraw_surface_init
(
struct
ddraw_surface
*
surface
,
struct
ddraw
*
ddraw
,
struct
wined3d_texture
*
wined3d_texture
,
unsigned
int
sub_resource_idx
,
struct
wined3d_surface
*
wined3d_surface
,
const
struct
wined3d_parent_ops
**
parent_ops
)
{
struct
ddraw_texture
*
texture
=
wined3d_texture_get_parent
(
wined3d_texture
);
...
...
@@ -6277,6 +6278,7 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru
surface
->
wined3d_surface
=
wined3d_surface
;
wined3d_texture_incref
(
surface
->
wined3d_texture
=
wined3d_texture
);
surface
->
sub_resource_idx
=
sub_resource_idx
;
*
parent_ops
=
&
ddraw_surface_wined3d_parent_ops
;
wined3d_private_store_init
(
&
surface
->
private_store
);
...
...
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