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
61fa6ea2
Commit
61fa6ea2
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_load_location().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0bf35ec9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
texture.c
dlls/wined3d/texture.c
+5
-2
No files found.
dlls/wined3d/texture.c
View file @
61fa6ea2
...
...
@@ -2152,6 +2152,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in
{
struct
wined3d_texture_sub_resource
*
sub_resource
=
&
texture
->
sub_resources
[
sub_resource_idx
];
DWORD
required_access
=
wined3d_resource_access_from_location
(
location
);
unsigned
int
row_pitch
,
slice_pitch
;
TRACE
(
"texture %p, sub_resource_idx %u, context %p, location %s.
\n
"
,
texture
,
sub_resource_idx
,
context
,
wined3d_debug_location
(
location
));
...
...
@@ -2192,14 +2193,16 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in
data
.
addr
+=
sub_resource
->
offset
;
wined3d_texture_bind_and_dirtify
(
texture
,
context
,
location
==
WINED3D_LOCATION_TEXTURE_SRGB
);
wined3d_volume_upload_data
(
texture
,
sub_resource_idx
,
context
,
&
data
);
wined3d_texture_get_pitch
(
texture
,
sub_resource_idx
,
&
row_pitch
,
&
slice_pitch
);
texture3d_upload_data
(
texture
,
sub_resource_idx
,
context
,
&
data
,
row_pitch
,
slice_pitch
);
}
else
if
(
sub_resource
->
locations
&
WINED3D_LOCATION_BUFFER
)
{
struct
wined3d_const_bo_address
data
=
{
sub_resource
->
buffer_object
,
NULL
};
wined3d_texture_bind_and_dirtify
(
texture
,
context
,
location
==
WINED3D_LOCATION_TEXTURE_SRGB
);
wined3d_volume_upload_data
(
texture
,
sub_resource_idx
,
context
,
&
data
);
wined3d_texture_get_pitch
(
texture
,
sub_resource_idx
,
&
row_pitch
,
&
slice_pitch
);
texture3d_upload_data
(
texture
,
sub_resource_idx
,
context
,
&
data
,
row_pitch
,
slice_pitch
);
}
else
if
(
sub_resource
->
locations
&
WINED3D_LOCATION_TEXTURE_RGB
)
{
...
...
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