Module: Mesa Branch: mesa_7_7_branch Commit: a1025ec041ff2700a0a58ee3586df6333caee593 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1025ec041ff2700a0a58ee3586df6333caee593
Author: José Fonseca <jfons...@vmware.com> Date: Fri Feb 12 23:17:04 2010 +0000 svga: A few more tweaks to blend color state emission. --- src/gallium/drivers/svga/svga_pipe_blend.c | 2 +- src/gallium/drivers/svga/svga_state_rss.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/svga/svga_pipe_blend.c b/src/gallium/drivers/svga/svga_pipe_blend.c index c0cbda3..3f5d908 100644 --- a/src/gallium/drivers/svga/svga_pipe_blend.c +++ b/src/gallium/drivers/svga/svga_pipe_blend.c @@ -223,7 +223,7 @@ static void svga_set_blend_color( struct pipe_context *pipe, svga->curr.blend_color = *blend_color; - svga->dirty |= SVGA_NEW_BLEND; + svga->dirty |= SVGA_NEW_BLEND_COLOR; } diff --git a/src/gallium/drivers/svga/svga_state_rss.c b/src/gallium/drivers/svga/svga_state_rss.c index b97e636..46a2d5e 100644 --- a/src/gallium/drivers/svga/svga_state_rss.c +++ b/src/gallium/drivers/svga/svga_state_rss.c @@ -26,7 +26,6 @@ #include "pipe/p_inlines.h" #include "pipe/p_defines.h" #include "util/u_math.h" -#include "util/u_pack_color.h" #include "svga_context.h" #include "svga_state.h" @@ -103,14 +102,13 @@ static int emit_rss( struct svga_context *svga, if (dirty & SVGA_NEW_BLEND_COLOR) { - unsigned color = 0; - ubyte r = float_to_ubyte(svga->curr.blend_color.color[0]); - ubyte g = float_to_ubyte(svga->curr.blend_color.color[1]); - ubyte b = float_to_ubyte(svga->curr.blend_color.color[2]); - ubyte a = float_to_ubyte(svga->curr.blend_color.color[3]); - - util_pack_color_ub( r, g, b, a, - PIPE_FORMAT_B8G8R8A8_UNORM, &color); + uint32 color; + uint32 r = float_to_ubyte(svga->curr.blend_color.color[0]); + uint32 g = float_to_ubyte(svga->curr.blend_color.color[1]); + uint32 b = float_to_ubyte(svga->curr.blend_color.color[2]); + uint32 a = float_to_ubyte(svga->curr.blend_color.color[3]); + + color = (a << 24) | (r << 16) | (g << 8) | b; EMIT_RS( svga, color, BLENDCOLOR, fail ); } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit