Henri Verbeet : wined3d: Use the same flags for wined3d_texture_set_color_key() and the " color_key_flags" field it sets.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Jan 19 13:44:11 2015 +0100

wined3d: Use the same flags for wined3d_texture_set_color_key() and the "color_key_flags" field it sets.

This fixes a regression introduced by commit a8ab56941577a01e17b947cddd374ba52ffd8245.

---

 dlls/wined3d/device.c  |  2 +-
 dlls/wined3d/state.c   |  4 ++--
 dlls/wined3d/surface.c | 14 +++++++-------
 dlls/wined3d/texture.c | 42 +++++++++++++++++++++---------------------
 dlls/wined3d/utils.c   |  4 ++--
 include/wine/wined3d.h | 35 ++++++-----------------------------
 6 files changed, 39 insertions(+), 62 deletions(-)

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