Henri Verbeet : wined3d: Use the correct source pitch and byte_count for uploading converted surfaces .

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Dec 12 20:53:57 2011 +0100

wined3d: Use the correct source pitch and byte_count for uploading converted surfaces.

---

 dlls/wined3d/surface.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0457ac6..bd45ae3 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6038,6 +6038,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
             return E_OUTOFMEMORY;
         }
         format.convert(surface->resource.allocatedMemory, mem, src_pitch, width, height);
+        format.byte_count = format.conv_byte_count;
+        src_pitch = dst_pitch;
     }
     else if (convert != NO_CONVERSION && surface->resource.allocatedMemory)
     {
@@ -6056,6 +6058,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
         }
         d3dfmt_convert_surface(surface->resource.allocatedMemory, mem, src_pitch,
                 width, height, dst_pitch, convert, surface);
+        format.byte_count = format.conv_byte_count;
+        src_pitch = dst_pitch;
     }
     else
     {