From: Keith Whitwell <keithw@vmware.com>
Date: Mon, 21 Dec 2009 19:22:45 +0000 (+0000)
Subject: i965g: remove half-finished change to tgsi_parse
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f72de22439a2d08bb461af60839baf4fbb3e54df;p=mesa.git

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 6754001e885..8a7ee0c7e4f 100644
--- 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 233dce03df2..bf65ca1cf2a 100644
--- 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);*/
       }
    }