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
daf754ce
Commit
daf754ce
authored
Feb 23, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Explicitly calculate the sub-resource layer in raw_blitter_blit().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
34992108
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
surface.c
dlls/wined3d/surface.c
+6
-4
No files found.
dlls/wined3d/surface.c
View file @
daf754ce
...
...
@@ -2587,6 +2587,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
unsigned
int
src_sub_resource_idx
,
dst_sub_resource_idx
;
struct
wined3d_texture
*
src_texture
,
*
dst_texture
;
unsigned
int
src_layer
,
dst_layer
;
struct
wined3d_blitter
*
next
;
GLuint
src_name
,
dst_name
;
DWORD
location
;
...
...
@@ -2625,6 +2626,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
if
(
!
wined3d_texture_load_location
(
src_texture
,
src_sub_resource_idx
,
context
,
location
))
ERR
(
"Failed to load the source sub-resource into %s.
\n
"
,
wined3d_debug_location
(
location
));
src_name
=
wined3d_texture_get_texture_name
(
src_texture
,
context
,
location
==
WINED3D_LOCATION_TEXTURE_SRGB
);
src_layer
=
src_sub_resource_idx
/
src_texture
->
level_count
;
location
=
dst_location
&
(
WINED3D_LOCATION_TEXTURE_RGB
|
WINED3D_LOCATION_TEXTURE_SRGB
);
if
(
!
location
)
...
...
@@ -2641,12 +2643,12 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
ERR
(
"Failed to load the destination sub-resource into %s.
\n
"
,
wined3d_debug_location
(
location
));
}
dst_name
=
wined3d_texture_get_texture_name
(
dst_texture
,
context
,
location
==
WINED3D_LOCATION_TEXTURE_SRGB
);
dst_layer
=
dst_sub_resource_idx
/
dst_texture
->
level_count
;
GL_EXTCALL
(
glCopyImageSubData
(
src_name
,
src_texture
->
target
,
src_surface
->
texture_level
,
src_rect
->
left
,
src_rect
->
top
,
src_surface
->
texture_layer
,
dst_name
,
dst_texture
->
target
,
dst_surface
->
texture_level
,
dst_rect
->
left
,
dst_rect
->
top
,
dst_surface
->
texture_layer
,
src_rect
->
right
-
src_rect
->
left
,
src_rect
->
bottom
-
src_rect
->
top
,
1
));
src_rect
->
left
,
src_rect
->
top
,
src_layer
,
dst_name
,
dst_texture
->
target
,
dst_surface
->
texture_level
,
dst_rect
->
left
,
dst_rect
->
top
,
dst_layer
,
src_rect
->
right
-
src_rect
->
left
,
src_rect
->
bottom
-
src_rect
->
top
,
1
));
checkGLcall
(
"copy image data"
);
wined3d_texture_validate_location
(
dst_texture
,
dst_sub_resource_idx
,
location
);
...
...
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