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

This commit is contained in:
Henri Verbeet 2011-12-12 20:53:57 +01:00 committed by Alexandre Julliard
parent 10d2a9375d
commit 943fcb0fc4
1 changed files with 4 additions and 0 deletions

View File

@ -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
{