Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
5444ce2f
Commit
5444ce2f
authored
Jun 12, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Jun 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/vmr9: Get rid of VMR9_ImagePresenter_PresentOffscreenSurface().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
408a3074
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
21 deletions
+10
-21
vmr9.c
dlls/quartz/vmr9.c
+10
-21
No files found.
dlls/quartz/vmr9.c
View file @
5444ce2f
...
@@ -2611,26 +2611,6 @@ static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *if
...
@@ -2611,26 +2611,6 @@ static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *if
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
VMR9_ImagePresenter_PresentOffscreenSurface
(
struct
default_presenter
*
This
,
IDirect3DSurface9
*
surface
)
{
HRESULT
hr
;
IDirect3DSurface9
*
target
=
NULL
;
hr
=
IDirect3DDevice9_GetBackBuffer
(
This
->
d3d9_dev
,
0
,
0
,
D3DBACKBUFFER_TYPE_MONO
,
&
target
);
if
(
FAILED
(
hr
))
{
ERR
(
"IDirect3DDevice9_GetBackBuffer -- %08x
\n
"
,
hr
);
return
hr
;
}
hr
=
IDirect3DDevice9_StretchRect
(
This
->
d3d9_dev
,
surface
,
NULL
,
target
,
NULL
,
D3DTEXF_POINT
);
if
(
FAILED
(
hr
))
ERR
(
"IDirect3DDevice9_StretchRect -- %08x
\n
"
,
hr
);
IDirect3DSurface9_Release
(
target
);
return
hr
;
}
static
HRESULT
WINAPI
VMR9_ImagePresenter_PresentImage
(
IVMRImagePresenter9
*
iface
,
static
HRESULT
WINAPI
VMR9_ImagePresenter_PresentImage
(
IVMRImagePresenter9
*
iface
,
DWORD_PTR
cookie
,
VMR9PresentationInfo
*
info
)
DWORD_PTR
cookie
,
VMR9PresentationInfo
*
info
)
{
{
...
@@ -2638,6 +2618,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
...
@@ -2638,6 +2618,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
const
struct
quartz_vmr
*
filter
=
presenter
->
pVMR9
;
const
struct
quartz_vmr
*
filter
=
presenter
->
pVMR9
;
IDirect3DDevice9
*
device
=
presenter
->
d3d9_dev
;
IDirect3DDevice9
*
device
=
presenter
->
d3d9_dev
;
const
RECT
src
=
filter
->
window
.
src
;
const
RECT
src
=
filter
->
window
.
src
;
IDirect3DSurface9
*
backbuffer
;
RECT
dst
=
filter
->
window
.
dst
;
RECT
dst
=
filter
->
window
.
dst
;
HRESULT
hr
;
HRESULT
hr
;
...
@@ -2654,7 +2635,15 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
...
@@ -2654,7 +2635,15 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
if
(
FAILED
(
hr
=
IDirect3DDevice9_BeginScene
(
device
)))
if
(
FAILED
(
hr
=
IDirect3DDevice9_BeginScene
(
device
)))
ERR
(
"Failed to begin scene, hr %#x.
\n
"
,
hr
);
ERR
(
"Failed to begin scene, hr %#x.
\n
"
,
hr
);
VMR9_ImagePresenter_PresentOffscreenSurface
(
presenter
,
info
->
lpSurf
);
if
(
FAILED
(
hr
=
IDirect3DDevice9_GetBackBuffer
(
device
,
0
,
0
,
D3DBACKBUFFER_TYPE_MONO
,
&
backbuffer
)))
{
ERR
(
"Failed to get backbuffer, hr %#x.
\n
"
,
hr
);
return
hr
;
}
if
(
FAILED
(
hr
=
IDirect3DDevice9_StretchRect
(
device
,
info
->
lpSurf
,
NULL
,
backbuffer
,
NULL
,
D3DTEXF_POINT
)))
ERR
(
"Failed to blit image, hr %#x.
\n
"
,
hr
);
IDirect3DSurface9_Release
(
backbuffer
);
if
(
FAILED
(
hr
=
IDirect3DDevice9_EndScene
(
device
)))
if
(
FAILED
(
hr
=
IDirect3DDevice9_EndScene
(
device
)))
ERR
(
"Failed to end scene, hr %#x.
\n
"
,
hr
);
ERR
(
"Failed to end scene, hr %#x.
\n
"
,
hr
);
...
...
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