=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Merge wined3d_surface_prepare() and wined3d_volume_prepare_location().

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Mon Apr 18 19:06:32 2016 +0200

wined3d: Merge wined3d_surface_prepare() and wined3d_volume_prepare_location().

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

---

 dlls/wined3d/surface.c         | 52 ++--------------------------
 dlls/wined3d/texture.c         | 77 +++++++++++++++++++++++++++++++-----------
 dlls/wined3d/volume.c          | 37 +-------------------
 dlls/wined3d/wined3d_private.h |  8 ++---
 4 files changed, 63 insertions(+), 111 deletions(-)

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