Henri Verbeet : wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Mar 20 15:29:58 2018 +0330

wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data().

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

---

 dlls/wined3d/surface.c         | 170 ++---------------------------------------
 dlls/wined3d/texture.c         | 149 +++++++++++++++++++++++++++++++++++-
 dlls/wined3d/wined3d_private.h |   5 --
 3 files changed, 154 insertions(+), 170 deletions(-)

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