Henri Verbeet : wined3d: Handle upload conversion in texture2d_upload_data ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: af47c9406b3bee54447b5530bc93a93e8bac0d88
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=af47c9406b3bee54447b5530bc93a93e8bac0d88

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Mar 21 13:18:51 2018 +0330

wined3d: Handle upload conversion in texture2d_upload_data().

For consistency with texture3d_upload_data().

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

---

 dlls/wined3d/surface.c         | 35 ++++---------------
 dlls/wined3d/texture.c         | 77 ++++++++++++++++++++++++++++++++----------
 dlls/wined3d/wined3d_private.h |  4 +--
 3 files changed, 67 insertions(+), 49 deletions(-)

Diff:   https://source.winehq.org/git/wine.git/?a=commitdiff;h=af47c9406b3bee54447b5530bc93a93e8bac0d88