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
b6b7e237
Commit
b6b7e237
authored
Apr 22, 2016
by
Stefan Dösinger
Committed by
Alexandre Julliard
Apr 25, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use wined3d_texture_prepare_location() in surface_depth_blt_fbo().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
34a1ef42
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
surface.c
dlls/wined3d/surface.c
+9
-6
No files found.
dlls/wined3d/surface.c
View file @
b6b7e237
...
@@ -402,6 +402,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
...
@@ -402,6 +402,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
struct
wined3d_surface
*
src_surface
,
DWORD
src_location
,
const
RECT
*
src_rect
,
struct
wined3d_surface
*
src_surface
,
DWORD
src_location
,
const
RECT
*
src_rect
,
struct
wined3d_surface
*
dst_surface
,
DWORD
dst_location
,
const
RECT
*
dst_rect
)
struct
wined3d_surface
*
dst_surface
,
DWORD
dst_location
,
const
RECT
*
dst_rect
)
{
{
unsigned
int
dst_sub_resource_idx
=
surface_get_sub_resource_idx
(
dst_surface
);
struct
wined3d_texture
*
dst_texture
=
dst_surface
->
container
;
struct
wined3d_texture
*
src_texture
=
src_surface
->
container
;
const
struct
wined3d_gl_info
*
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
;
struct
wined3d_context
*
context
;
struct
wined3d_context
*
context
;
DWORD
src_mask
,
dst_mask
;
DWORD
src_mask
,
dst_mask
;
...
@@ -413,21 +416,21 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
...
@@ -413,21 +416,21 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
TRACE
(
"dst_surface %p, dst_location %s, dst_rect %s.
\n
"
,
TRACE
(
"dst_surface %p, dst_location %s, dst_rect %s.
\n
"
,
dst_surface
,
wined3d_debug_location
(
dst_location
),
wine_dbgstr_rect
(
dst_rect
));
dst_surface
,
wined3d_debug_location
(
dst_location
),
wine_dbgstr_rect
(
dst_rect
));
src_mask
=
src_
surface
->
container
->
resource
.
format_flags
&
(
WINED3DFMT_FLAG_DEPTH
|
WINED3DFMT_FLAG_STENCIL
);
src_mask
=
src_
texture
->
resource
.
format_flags
&
(
WINED3DFMT_FLAG_DEPTH
|
WINED3DFMT_FLAG_STENCIL
);
dst_mask
=
dst_
surface
->
container
->
resource
.
format_flags
&
(
WINED3DFMT_FLAG_DEPTH
|
WINED3DFMT_FLAG_STENCIL
);
dst_mask
=
dst_
texture
->
resource
.
format_flags
&
(
WINED3DFMT_FLAG_DEPTH
|
WINED3DFMT_FLAG_STENCIL
);
if
(
src_mask
!=
dst_mask
)
if
(
src_mask
!=
dst_mask
)
{
{
ERR
(
"Incompatible formats %s and %s.
\n
"
,
ERR
(
"Incompatible formats %s and %s.
\n
"
,
debug_d3dformat
(
src_
surface
->
container
->
resource
.
format
->
id
),
debug_d3dformat
(
src_
texture
->
resource
.
format
->
id
),
debug_d3dformat
(
dst_
surface
->
container
->
resource
.
format
->
id
));
debug_d3dformat
(
dst_
texture
->
resource
.
format
->
id
));
return
;
return
;
}
}
if
(
!
src_mask
)
if
(
!
src_mask
)
{
{
ERR
(
"Not a depth / stencil format: %s.
\n
"
,
ERR
(
"Not a depth / stencil format: %s.
\n
"
,
debug_d3dformat
(
src_
surface
->
container
->
resource
.
format
->
id
));
debug_d3dformat
(
src_
texture
->
resource
.
format
->
id
));
return
;
return
;
}
}
...
@@ -451,7 +454,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
...
@@ -451,7 +454,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
if
(
!
surface_is_full_rect
(
dst_surface
,
dst_rect
))
if
(
!
surface_is_full_rect
(
dst_surface
,
dst_rect
))
surface_load_location
(
dst_surface
,
context
,
dst_location
);
surface_load_location
(
dst_surface
,
context
,
dst_location
);
else
else
wined3d_
surface_prepare
(
dst_surface
,
context
,
dst_location
);
wined3d_
texture_prepare_location
(
dst_texture
,
dst_sub_resource_idx
,
context
,
dst_location
);
gl_info
=
context
->
gl_info
;
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