Henri Verbeet : wined3d: Unify WINED3D_RTYPE_TEXTURE and WINED3D_RTYPE_CUBE_TEXTURE.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Jan 27 00:06:23 2016 +0100

wined3d: Unify WINED3D_RTYPE_TEXTURE and WINED3D_RTYPE_CUBE_TEXTURE.

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

---

 dlls/d3d11/texture.c           |   2 +-
 dlls/d3d8/device.c             |   4 +-
 dlls/d3d8/directx.c            |  26 +++++++-
 dlls/d3d8/texture.c            |   6 +-
 dlls/d3d9/device.c             |   4 +-
 dlls/d3d9/directx.c            |  26 +++++++-
 dlls/d3d9/texture.c            |   6 +-
 dlls/ddraw/device.c            |   6 +-
 dlls/ddraw/surface.c           |  18 ++---
 dlls/wined3d/device.c          |  60 +++++++----------
 dlls/wined3d/directx.c         |  38 ++++-------
 dlls/wined3d/resource.c        | 148 ++++++++++++++++++++++-------------------
 dlls/wined3d/surface.c         |   2 +-
 dlls/wined3d/swapchain.c       |   2 +-
 dlls/wined3d/texture.c         |  11 ++-
 dlls/wined3d/utils.c           |  15 ++---
 dlls/wined3d/wined3d_private.h |   5 +-
 include/wine/wined3d.h         |   9 +--
 18 files changed, 207 insertions(+), 181 deletions(-)

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