i965g: fixes to build after merge of master

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

diff --git a/src/gallium/drivers/i965/brw_state_upload.c b/src/gallium/drivers/i965/brw_state_upload.c
index a71af4d2b91d01878e099c32977a8415edbda443..f8b91eff816709cb65420b9e719e55bb9c3aa32c 100644 (file)
--- a/src/gallium/drivers/i965/brw_state_upload.c
+++ b/src/gallium/drivers/i965/brw_state_upload.c
@@ -38,9 +38,7 @@
 
 const struct brw_tracked_state *atoms[] =
 {
-   &brw_check_fallback,
-
-//   &brw_wm_input_sizes,
+/*   &brw_wm_input_sizes, */
    &brw_vs_prog,
    &brw_gs_prog, 
    &brw_clip_prog, 
@@ -58,7 +56,7 @@ const struct brw_tracked_state *atoms[] =
    &brw_cc_unit,
 
    &brw_vs_surfaces,           /* must do before unit */
-   &brw_wm_constant_surface,   /* must do before wm surfaces/bind bo */
+   /*&brw_wm_constant_surface,*/       /* must do before wm surfaces/bind bo */
    &brw_wm_surfaces,           /* must do before samplers and unit */
    &brw_wm_samplers,
 
@@ -140,8 +138,7 @@ brw_clear_validated_bos(struct brw_context *brw)
 
    /* Clear the last round of validated bos */
    for (i = 0; i < brw->state.validated_bo_count; i++) {
-      brw->sws->bo_unreference(brw->state.validated_bos[i]);
-      brw->state.validated_bos[i] = NULL;
+      bo_reference(&brw->state.validated_bos[i], NULL);
    }
    brw->state.validated_bo_count = 0;
 }
@@ -194,7 +191,7 @@ enum pipe_error brw_validate_state( struct brw_context *brw )
       const struct brw_fragment_shader *fp = brw->curr.fragment_shader;
       if (fp) {
          assert(fp->info.file_max[TGSI_FILE_SAMPLER] < (int)brw->curr.num_samplers);
-        assert(fp->info.texture_max <= brw->curr.num_textures);
+        /*assert(fp->info.texture_max <= brw->curr.num_textures);*/
       }
    }