Henri Verbeet : wined3d: Support all fixups in shader_none_color_fixup_supported().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Fri Jan 25 10:57:18 2013 +0100

wined3d: Support all fixups in shader_none_color_fixup_supported().

---

dlls/wined3d/shader.c |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 2bb5f21..44f67cc 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -32,7 +32,6 @@
 #include "wined3d_private.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
-WINE_DECLARE_DEBUG_CHANNEL(d3d);

static const char * const shader_opcode_names[] =
 {
@@ -1554,21 +1553,9 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s

static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup)
 {
-    if (TRACE_ON(d3d_shader) && TRACE_ON(d3d))
-    {
-        TRACE("Checking support for fixup:\n");
-        dump_color_fixup_desc(fixup);
-    }
-
-    /* Faked to make some apps happy. */
-    if (!is_complex_fixup(fixup))
-    {
-        TRACE("[OK]\n");
-        return TRUE;
-    }
-
-    TRACE("[FAILED]\n");
-    return FALSE;
+    /* We "support" every possible fixup, since we don't support any shader
+     * model, and will never have to actually sample a texture. */
+    return TRUE;
 }

static BOOL shader_none_has_ffp_proj_control(void *shader_priv)