Henri Verbeet : wined3d: Merge wined3d_volume_load_location() into texture3d_load_location().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2337c50ed769f2078257283f82aa7e696b452324
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2337c50ed769f2078257283f82...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Jul 28 13:29:40 2016 +0200

wined3d: Merge wined3d_volume_load_location() into texture3d_load_location().

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

---

 dlls/wined3d/texture.c         | 199 ++++++++++++++++++++++++++++++++++++++-
 dlls/wined3d/volume.c          | 206 -----------------------------------------
 dlls/wined3d/wined3d_private.h |   2 -
 3 files changed, 198 insertions(+), 209 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=2337c50ed769f207825728...