=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc .

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Jan  7 22:12:15 2014 +0100

wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc .

---

 dlls/d3d8/device.c        |    2 +-
 dlls/d3d9/device.c        |    7 ++++--
 dlls/ddraw/surface.c      |   25 ++++----------------
 dlls/wined3d/device.c     |    6 ++---
 dlls/wined3d/surface.c    |   57 +++++++++++++--------------------------------
 dlls/wined3d/wined3d.spec |    3 +--
 include/wine/wined3d.h    |    4 ++--
 7 files changed, 33 insertions(+), 71 deletions(-)

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