Henri Verbeet : wined3d: Unify the shader state IDs.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Oct  9 10:39:38 2013 +0200

wined3d: Unify the shader state IDs.

---

 dlls/wined3d/arb_program_shader.c    |  152 +++++++++++++++++-----------------
 dlls/wined3d/ati_fragment_shader.c   |    4 +-
 dlls/wined3d/cs.c                    |    8 +-
 dlls/wined3d/glsl_shader.c           |  150 +++++++++++++++++-----------------
 dlls/wined3d/nvidia_texture_shader.c |    4 +-
 dlls/wined3d/state.c                 |   16 ++--
 dlls/wined3d/utils.c                 |   23 ++++--
 dlls/wined3d/wined3d_private.h       |   15 +--
 8 files changed, 189 insertions(+), 183 deletions(-)

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