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
0bf35ec9
Commit
0bf35ec9
authored
Aug 01, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 01, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use texture3d_upload_data() in texture3d_srgb_transfer().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1cc4d848
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
texture.c
dlls/wined3d/texture.c
+4
-1
No files found.
dlls/wined3d/texture.c
View file @
0bf35ec9
...
@@ -2122,6 +2122,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in
...
@@ -2122,6 +2122,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in
struct
wined3d_context
*
context
,
BOOL
dest_is_srgb
)
struct
wined3d_context
*
context
,
BOOL
dest_is_srgb
)
{
{
struct
wined3d_texture_sub_resource
*
sub_resource
=
&
texture
->
sub_resources
[
sub_resource_idx
];
struct
wined3d_texture_sub_resource
*
sub_resource
=
&
texture
->
sub_resources
[
sub_resource_idx
];
unsigned
int
row_pitch
,
slice_pitch
;
struct
wined3d_bo_address
data
;
struct
wined3d_bo_address
data
;
/* Optimisations are possible, but the effort should be put into either
/* Optimisations are possible, but the effort should be put into either
...
@@ -2135,10 +2136,12 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in
...
@@ -2135,10 +2136,12 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in
if
(
!
(
data
.
addr
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sub_resource
->
size
)))
if
(
!
(
data
.
addr
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sub_resource
->
size
)))
return
;
return
;
wined3d_texture_get_pitch
(
texture
,
sub_resource_idx
,
&
row_pitch
,
&
slice_pitch
);
wined3d_texture_bind_and_dirtify
(
texture
,
context
,
!
dest_is_srgb
);
wined3d_texture_bind_and_dirtify
(
texture
,
context
,
!
dest_is_srgb
);
texture3d_download_data
(
texture
,
sub_resource_idx
,
context
,
&
data
);
texture3d_download_data
(
texture
,
sub_resource_idx
,
context
,
&
data
);
wined3d_texture_bind_and_dirtify
(
texture
,
context
,
dest_is_srgb
);
wined3d_texture_bind_and_dirtify
(
texture
,
context
,
dest_is_srgb
);
wined3d_volume_upload_data
(
texture
,
sub_resource_idx
,
context
,
wined3d_const_bo_address
(
&
data
));
texture3d_upload_data
(
texture
,
sub_resource_idx
,
context
,
wined3d_const_bo_address
(
&
data
),
row_pitch
,
slice_pitch
);
HeapFree
(
GetProcessHeap
(),
0
,
data
.
addr
);
HeapFree
(
GetProcessHeap
(),
0
,
data
.
addr
);
}
}
...
...
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