Commit d7e05190 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Use the texture dimension helpers in wined3d_volume_upload_data().

parent 1ccc5216
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment