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
6d823825
Commit
6d823825
authored
Mar 22, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 23, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get resource info from the texture in surface_blt_special().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c526188b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
surface.c
dlls/wined3d/surface.c
+11
-7
No files found.
dlls/wined3d/surface.c
View file @
6d823825
...
...
@@ -2621,35 +2621,39 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
struct
wined3d_surface
*
src_surface
,
const
RECT
*
src_rect
,
DWORD
flags
,
const
struct
wined3d_blt_fx
*
fx
,
enum
wined3d_texture_filter_type
filter
)
{
struct
wined3d_device
*
device
=
dst_surface
->
resource
.
device
;
struct
wined3d_texture
*
dst_texture
=
dst_surface
->
container
;
struct
wined3d_device
*
device
=
dst_texture
->
resource
.
device
;
const
struct
wined3d_surface
*
rt
=
wined3d_rendertarget_view_get_surface
(
device
->
fb
.
render_targets
[
0
]);
struct
wined3d_swapchain
*
src_swapchain
,
*
dst_swapchain
;
struct
wined3d_texture
*
src_texture
;
TRACE
(
"dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.
\n
"
,
dst_surface
,
wine_dbgstr_rect
(
dst_rect
),
src_surface
,
wine_dbgstr_rect
(
src_rect
),
flags
,
fx
,
debug_d3dtexturefiltertype
(
filter
));
/* Get the swapchain. One of the surfaces has to be a primary surface */
if
(
dst_
surfac
e
->
resource
.
pool
==
WINED3D_POOL_SYSTEM_MEM
)
if
(
dst_
textur
e
->
resource
.
pool
==
WINED3D_POOL_SYSTEM_MEM
)
{
WARN
(
"Destination is in sysmem, rejecting gl blt
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
dst_swapchain
=
dst_
surface
->
container
->
swapchain
;
dst_swapchain
=
dst_
texture
->
swapchain
;
if
(
src_surface
)
{
if
(
src_surface
->
resource
.
pool
==
WINED3D_POOL_SYSTEM_MEM
)
src_texture
=
src_surface
->
container
;
if
(
src_texture
->
resource
.
pool
==
WINED3D_POOL_SYSTEM_MEM
)
{
WARN
(
"Src is in sysmem, rejecting gl blt
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
src_swapchain
=
src_
surface
->
container
->
swapchain
;
src_swapchain
=
src_
texture
->
swapchain
;
}
else
{
src_texture
=
NULL
;
src_swapchain
=
NULL
;
}
...
...
@@ -2698,8 +2702,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
BOOL
stretchx
;
/* P8 read back is not implemented */
if
(
src_
surfac
e
->
resource
.
format
->
id
==
WINED3DFMT_P8_UINT
||
dst_
surfac
e
->
resource
.
format
->
id
==
WINED3DFMT_P8_UINT
)
if
(
src_
textur
e
->
resource
.
format
->
id
==
WINED3DFMT_P8_UINT
||
dst_
textur
e
->
resource
.
format
->
id
==
WINED3DFMT_P8_UINT
)
{
TRACE
(
"P8 read back not supported by frame buffer to texture blit
\n
"
);
return
WINED3DERR_INVALIDCALL
;
...
...
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