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
d7e05190
Commit
d7e05190
authored
Apr 13, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 14, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use the texture dimension helpers in wined3d_volume_upload_data().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1ccc5216
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
volume.c
dlls/wined3d/volume.c
+5
-3
No files found.
dlls/wined3d/volume.c
View file @
d7e05190
...
...
@@ -79,9 +79,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
struct
wined3d_texture
*
texture
=
volume
->
container
;
const
struct
wined3d_format
*
format
=
texture
->
resource
.
format
;
UINT
width
=
volume
->
resource
.
width
;
UINT
height
=
volume
->
resource
.
height
;
UINT
depth
=
volume
->
resource
.
depth
;
unsigned
int
width
,
height
,
depth
;
const
void
*
mem
=
data
->
addr
;
void
*
converted_mem
=
NULL
;
...
...
@@ -89,6 +87,10 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine
volume
,
context
,
volume
->
texture_level
,
debug_d3dformat
(
format
->
id
),
format
->
id
);
width
=
wined3d_texture_get_level_width
(
texture
,
volume
->
texture_level
);
height
=
wined3d_texture_get_level_height
(
texture
,
volume
->
texture_level
);
depth
=
wined3d_texture_get_level_depth
(
texture
,
volume
->
texture_level
);
if
(
format
->
convert
)
{
UINT
dst_row_pitch
,
dst_slice_pitch
;
...
...
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