Mesa (master): svga: enable code to emit blend color

[Roland Scheidegger]

Module: Mesa
Branch: master
Commit: 7082c47d1499bdc9348cf7a80ff3749d299898fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7082c47d1499bdc9348cf7a80ff3749d299898fa

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Fri Feb 12 21:43:45 2010 +0100

svga: enable code to emit blend color

---

 src/gallium/drivers/svga/svga_state_rss.c |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_state_rss.c b/src/gallium/drivers/svga/svga_state_rss.c
index 68828c2..15ead98 100644
--- a/src/gallium/drivers/svga/svga_state_rss.c
+++ b/src/gallium/drivers/svga/svga_state_rss.c
@@ -26,9 +26,7 @@
 #include "util/u_inlines.h"
 #include "pipe/p_defines.h"
 #include "util/u_math.h"
-#if 0
 #include "util/u_pack_color.h"
-#endif
 
 #include "svga_context.h"
 #include "svga_state.h"
@@ -103,8 +101,6 @@ static int emit_rss( struct svga_context *svga,
       }
    }
 
-#if 0
-   /* FIXME: shouldn't we emit blend color here */
    if (dirty & SVGA_NEW_BLEND_COLOR) {
       union util_color uc;
       ubyte r = float_to_ubyte(svga->curr.blend_color.color[0]);
@@ -117,9 +113,6 @@ static int emit_rss( struct svga_context *svga,
 
       EMIT_RS( svga, uc.ui, BLENDCOLOR, fail );
    }
-#endif
-
-
 
    if (dirty & (SVGA_NEW_DEPTH_STENCIL | SVGA_NEW_RAST)) {
       const struct svga_depth_stencil_state *curr = svga->curr.depth; 
@@ -252,13 +245,10 @@ static int emit_rss( struct svga_context *svga,
       memcpy( rs,
               queue.rs,
               queue.rs_count * sizeof queue.rs[0]);
-      
+
       SVGA_FIFOCommitAll( svga->swc );
    }
 
-   /* Also blend color:
-    */
-
    return 0;
 
 fail:
@@ -278,9 +268,7 @@ struct svga_tracked_state svga_hw_rss =
    "hw rss state",
 
    (SVGA_NEW_BLEND |
-#if 0
     SVGA_NEW_BLEND_COLOR |
-#endif
     SVGA_NEW_DEPTH_STENCIL |
     SVGA_NEW_STENCIL_REF |
     SVGA_NEW_RAST |