Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data().

Alexandre Julliard julliard at wine.codeweavers.com
Wed Feb 10 11:11:09 CST 2016


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Feb  9 21:30:00 2016 +0100

wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/volume.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 9931057..16b6555 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -76,7 +76,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine
         dst_row_pitch = width * format->conv_byte_count;
         dst_slice_pitch = dst_row_pitch * height;
 
-        wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch);
+        wined3d_texture_get_pitch(volume->container, 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,




More information about the wine-cvs mailing list