i965g: remove half-finished change to tgsi_parse

diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 6754001e88544bddb016283c95286d9571265be9..8a7ee0c7e4f1f1e2e69f159586f45d0a8cd28018 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -61,9 +61,6 @@ struct tgsi_shader_info
    boolean uses_kill;  /**< KIL or KILP instruction used? */
    boolean uses_fogcoord; /**< fragment shader uses fog coord? */
    boolean uses_frontfacing; /**< fragment shader uses front/back-face flag? */
-
-   uint texture_max;
-   uint texture_mask;
 };
 
 

diff --git a/src/gallium/drivers/i965/brw_state_upload.c b/src/gallium/drivers/i965/brw_state_upload.c
index 233dce03df27edea88193df251cd0f5afd972981..bf65ca1cf2ac12f35a6d862c639e3d79a38ee7c8 100644 (file)
--- a/src/gallium/drivers/i965/brw_state_upload.c
+++ b/src/gallium/drivers/i965/brw_state_upload.c
@@ -191,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);*/
       }
    }