Revert "[965] Add missing flagging of new stage programs for updating stage state."

I had forgotten part of brw_state_cache.c that made this fix not relevant for
master (last_addr comparison and flagging based on cache id).

This reverts commit a4642f3d18bdaebaba31e5dee72fe5de9d890ffb.

1 files changed, 6 insertions, 18 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index a889a9900f..e173f6fce3 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -90,8 +90,6 @@ static void brw_upload_vs_prog( struct brw_context *brw )
    struct brw_vs_prog_key key;
    struct brw_vertex_program *vp = 
       (struct brw_vertex_program *)brw->vertex_program;
-   struct brw_vs_prog_data *prog_data;
-   uint32_t offset;
 
    assert (vp && !vp->program.IsNVProgram);
    
@@ -112,23 +110,13 @@ static void brw_upload_vs_prog( struct brw_context *brw )
 
    /* Make an early check for the key.
     */
-   if (brw_search_cache(&brw->cache[BRW_VS_PROG],
+   if (brw_search_cache(&brw->cache[BRW_VS_PROG], 
 			&key, sizeof(key),
-			&prog_data,
-			&offset)) {
-      if (offset != brw->vs.prog_gs_offset ||
-	  !brw->vs.prog_data ||
-	  memcmp(prog_data, &brw->vs.prog_data,
-		 sizeof(*brw->vs.prog_data)) != 0)
-      {
-	 brw->vs.prog_gs_offset = offset;
-	 brw->vs.prog_data = prog_data;
-	 brw->state.dirty.cache |= CACHE_NEW_VS_PROG;
-      }
-   } else {
-      do_vs_prog(brw, vp, &key);
-      brw->state.dirty.cache |= CACHE_NEW_VS_PROG;
-   }
+			&brw->vs.prog_data,
+			&brw->vs.prog_gs_offset))
+       return;
+
+   do_vs_prog(brw, vp, &key);
 }