From 7f69a345748daea05581f48c089012481b6a2820 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 10 Feb 2016 19:29:56 +0100 Subject: [PATCH] wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map(). Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/wined3d/volume.c | 8 ++------ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 16b6555053f..75585d83814 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -40,11 +40,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) return TRUE; } -void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) -{ - wined3d_texture_get_pitch(volume->container, volume->texture_level, row_pitch, slice_pitch); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -588,7 +583,8 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, } else { - wined3d_volume_get_pitch(volume, &map_desc->row_pitch, &map_desc->slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, + &map_desc->row_pitch, &map_desc->slice_pitch); } if (!box) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 470db1f736c..56ca786f886 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2444,7 +2444,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) DECLSPEC_HIDDEN HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; -void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; -- 2.11.4.GIT