Henri Verbeet : wined3d: Get resource info from the texture in wined3d_volume_upload_data().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2d4080f25d093d20123a40b3ed92b84c282a119b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2d4080f25d093d20123a40b3ed...

Author: Henri Verbeet 
Date:   Mon Mar 28 18:57:58 2016 +0200

wined3d: Get resource info from the texture in wined3d_volume_upload_data().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/volume.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index c846ec4..a4d3eb2 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -77,7 +77,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine
         const struct wined3d_const_bo_address *data)
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-    const struct wined3d_format *format = volume->resource.format;
+    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;
@@ -95,13 +96,13 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine

if (data->buffer_object)
             ERR("Loading a converted volume from a PBO.\n");
-        if (volume->container->resource.format_flags & WINED3DFMT_FLAG_BLOCKS)
+        if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS)
             ERR("Converting a block-based format.\n");

dst_row_pitch = width * format->conv_byte_count;
         dst_slice_pitch = dst_row_pitch * height;

-        wined3d_texture_get_pitch(volume->container, volume->texture_level, &src_row_pitch, &src_slice_pitch);
+        wined3d_texture_get_pitch(texture, volume->texture_level, &src_row_pitch, &src_slice_pitch);

converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth);
         format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,