Henri Verbeet : wined3d: Merge the texture implementations.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Mar 18 19:10:58 2011 +0100

wined3d: Merge the texture implementations.

---

 dlls/wined3d/Makefile.in       |    3 -
 dlls/wined3d/basetexture.c     |  560 -------------------
 dlls/wined3d/cubetexture.c     |  469 ----------------
 dlls/wined3d/texture.c         | 1197 ++++++++++++++++++++++++++++++++++------
 dlls/wined3d/volumetexture.c   |  383 -------------
 dlls/wined3d/wined3d_private.h |   17 -
 6 files changed, 1017 insertions(+), 1612 deletions(-)

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