Stefan Dösinger : wined3d: Implement the state merger and start to use it.

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Jul  1 19:43:52 2008 -0500

wined3d: Implement the state merger and start to use it.

---

 dlls/wined3d/directx.c         |    4 +-
 dlls/wined3d/state.c           |  125 +++++++++++++++++++++++++++++++++++-----
 dlls/wined3d/wined3d_private.h |   21 ++++++-
 3 files changed, 132 insertions(+), 18 deletions(-)

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