Henri Verbeet : wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Aug 16 01:49:39 2019 +0430

wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data().

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

---

 dlls/wined3d/texture.c         | 148 +++++++++++++++++++----------------------
 dlls/wined3d/wined3d_private.h |   4 --
 2 files changed, 67 insertions(+), 85 deletions(-)

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