wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map().

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

wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_map().
7f69a345 · Henri Verbeet · Alexandre Julliard · a8c6c9f4 · 7f69a345 · 7f69a345
Commit 7f69a345 authored Feb 10, 2016 by Henri Verbeet Committed by Alexandre Julliard Feb 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

volume.c dlls/wined3d/volume.c +2 -6

wined3d_private.h dlls/wined3d/wined3d_private.h +0 -1

No files found.
--- 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)

--- 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;