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
23103780
Commit
23103780
authored
Apr 10, 2017
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Require a valid source rectangle in surface_upload_from_surface().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f243302e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
21 deletions
+0
-21
surface.c
dlls/wined3d/surface.c
+0
-21
No files found.
dlls/wined3d/surface.c
View file @
23103780
...
...
@@ -859,13 +859,6 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
}
}
static
BOOL
wined3d_surface_check_rect_dimensions
(
struct
wined3d_surface
*
surface
,
const
RECT
*
rect
)
{
struct
wined3d_box
box
=
{
rect
->
left
,
rect
->
top
,
rect
->
right
,
rect
->
bottom
,
0
,
1
};
return
SUCCEEDED
(
wined3d_texture_check_box_dimensions
(
surface
->
container
,
surface
->
texture_level
,
&
box
));
}
static
HRESULT
surface_upload_from_surface
(
struct
wined3d_surface
*
dst_surface
,
const
POINT
*
dst_point
,
struct
wined3d_surface
*
src_surface
,
const
RECT
*
src_rect
)
{
...
...
@@ -878,25 +871,11 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface,
struct
wined3d_context
*
context
;
struct
wined3d_bo_address
data
;
UINT
update_w
,
update_h
;
RECT
r
;
TRACE
(
"dst_surface %p, dst_point %s, src_surface %p, src_rect %s.
\n
"
,
dst_surface
,
wine_dbgstr_point
(
dst_point
),
src_surface
,
wine_dbgstr_rect
(
src_rect
));
if
(
!
src_rect
)
{
SetRect
(
&
r
,
0
,
0
,
wined3d_texture_get_level_width
(
src_texture
,
src_surface
->
texture_level
),
wined3d_texture_get_level_height
(
src_texture
,
src_surface
->
texture_level
));
src_rect
=
&
r
;
}
if
(
!
wined3d_surface_check_rect_dimensions
(
src_surface
,
src_rect
))
{
WARN
(
"Source rectangle not block-aligned.
\n
"
);
return
WINED3DERR_INVALIDCALL
;
}
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