galahad: do map/unmap counting for resources

[mesa.git] / src / gallium / drivers / i965 / brw_wm_emit.c

diff --git a/src/gallium/drivers/i965/brw_wm_emit.c b/src/gallium/drivers/i965/brw_wm_emit.c
index 3250db18486c59e2ea85748c8e9c0bd13954e108..8f983a60ae86fbcd3b3bc3ad261e48b232aa788e 100644 (file)
--- a/src/gallium/drivers/i965/brw_wm_emit.c
+++ b/src/gallium/drivers/i965/brw_wm_emit.c
@@ -35,6 +35,7 @@
 #include "brw_context.h"
 #include "brw_wm.h"
 #include "brw_debug.h"
+#include "brw_disasm.h"
 
 /* Not quite sure how correct this is - need to understand horiz
  * vs. vertical strides a little better.
@@ -690,7 +691,7 @@ static void emit_xpd( struct brw_compile *p,
 {
    GLuint i;
 
-   assert(!(mask & BRW_WRITEMASK_W) == BRW_WRITEMASK_X);
+   assert((mask & BRW_WRITEMASK_W) != BRW_WRITEMASK_W);
    
    for (i = 0 ; i < 3; i++) {
       if (mask & (1<<i)) {
@@ -1006,7 +1007,7 @@ static void emit_killp( struct brw_wm_compile *c )
 
    brw_push_insn_state(p);
    brw_set_mask_control(p, BRW_MASK_DISABLE);
-   brw_NOT(p, c->emit_mask_reg, brw_mask_reg(1)); //IMASK
+   brw_NOT(p, c->emit_mask_reg, brw_mask_reg(1)); /* IMASK */
    brw_AND(p, r0uw, c->emit_mask_reg, r0uw);
    brw_pop_insn_state(p);
 }