Merge branch 'mesa_7_5_branch'

[mesa.git] / src / gallium / drivers / i965simple / brw_wm_state.c

diff --git a/src/gallium/drivers/i965simple/brw_wm_state.c b/src/gallium/drivers/i965simple/brw_wm_state.c
index 5ccd4888423d3734f9512690cc921947dff4d716..37a9bf919cd249f4229a00438c1ed3ff0d3cef55 100644 (file)
--- a/src/gallium/drivers/i965simple/brw_wm_state.c
+++ b/src/gallium/drivers/i965simple/brw_wm_state.c
@@ -34,7 +34,8 @@
 #include "brw_state.h"
 #include "brw_defines.h"
 #include "brw_wm.h"
-#include "pipe/p_util.h"
+#include "util/u_math.h"
+#include "util/u_memory.h"
 
 /***********************************************************************
  * WM unit - fragment programs and rasterization
@@ -117,11 +118,11 @@ static void upload_wm_unit(struct brw_context *brw )
       if (fp->UsesDepth)
         wm.wm5.program_uses_depth = 1; /* as far as we can tell */
 
-      if (fp->ComputesDepth)
+      if (fp->info.writes_z)
         wm.wm5.program_computes_depth = 1;
 
       /* BRW_NEW_ALPHA_TEST */
-      if (fp->UsesKill ||
+      if (fp->info.uses_kill ||
          brw->attribs.DepthStencil->alpha.enabled)
         wm.wm5.program_uses_killpixel = 1;