wined3d: Pass the destination pitch to format conversion functions.

The relation between src and dst pitches is not correct if the source pitch is padded to match pitch alignment requirements.

wined3d: Pass the destination pitch to format conversion functions.
24fbe9f2 · Stefan Dösinger · Alexandre Julliard · 0fb3aaac · 24fbe9f2 · 24fbe9f2
Commit 24fbe9f2 authored Sep 20, 2013 by Stefan Dösinger Committed by Alexandre Julliard Sep 20, 2013
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 43 additions and 38 deletions

surface.c dlls/wined3d/surface.c +1 -1

utils.c dlls/wined3d/utils.c +41 -36

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

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5524,7 +5524,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
            context_release(context);
            return E_OUTOFMEMORY;
        }
-        format.convert(surface->resource.allocatedMemory, mem, src_pitch, width, height);
+        format.convert(surface->resource.allocatedMemory, mem, src_pitch, dst_pitch, width, height);
        format.byte_count = format.conv_byte_count;
        src_pitch = dst_pitch;
    }

--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2970,7 +2970,7 @@ struct wined3d_format
    unsigned int flags;
    struct wined3d_rational height_scale;
    struct color_fixup_desc color_fixup;
-    void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height);
+    void (*convert)(const BYTE *src, BYTE *dst, UINT src_pitch, UINT dst_pitch, UINT width, UINT height);
 };

 const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info,