gallium/i965: remove UsesDepth, UsesKill - use tgsi_shader_info instead

diff --git a/src/gallium/drivers/i965simple/brw_context.h b/src/gallium/drivers/i965simple/brw_context.h
index fbc89c889bbc87a3897ff01e641d6418928d2d5d..170d50c5c37df61ff35595c4cbf7a2a451fff1fb 100644 (file)
--- a/src/gallium/drivers/i965simple/brw_context.h
+++ b/src/gallium/drivers/i965simple/brw_context.h
@@ -218,8 +218,6 @@ struct brw_fragment_program {
    struct brw_shader_info info2;  /* XXX get rid of this */
    
    boolean UsesDepth;
-   boolean UsesKill;
-   boolean ComputesDepth;
    int id;
 };
 

diff --git a/src/gallium/drivers/i965simple/brw_wm.c b/src/gallium/drivers/i965simple/brw_wm.c
index 539b17074441e1507d07af1cccdfb8c3e17788f8..1c4b5b5ede2b4bc26048ad2a22db41eae687a477 100644 (file)
--- a/src/gallium/drivers/i965simple/brw_wm.c
+++ b/src/gallium/drivers/i965simple/brw_wm.c
@@ -94,11 +94,11 @@ static void brw_wm_populate_key( struct brw_context *brw,
    /* Build the index for table lookup
     */
    /* BRW_NEW_DEPTH_STENCIL */
-   if (fp->UsesKill ||
+   if (fp->info.uses_kill ||
        brw->attribs.DepthStencil->alpha.enabled)
       lookup |= IZ_PS_KILL_ALPHATEST_BIT;
 
-   if (fp->ComputesDepth)
+   if (fp->info.writes_z)
       lookup |= IZ_PS_COMPUTES_DEPTH_BIT;
 
    if (brw->attribs.DepthStencil->depth.enabled)

diff --git a/src/gallium/drivers/i965simple/brw_wm_state.c b/src/gallium/drivers/i965simple/brw_wm_state.c
index 5ccd4888423d3734f9512690cc921947dff4d716..f3aa36b07f8b1969c70f3ec5821c220b3a320193 100644 (file)
--- a/src/gallium/drivers/i965simple/brw_wm_state.c
+++ b/src/gallium/drivers/i965simple/brw_wm_state.c
@@ -117,11 +117,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;