From c2e36bdd1a58ba6f58c4e72db1f7f64e8bd05901 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <darktama@beleth.(none)>
Date: Fri, 22 Feb 2008 13:55:18 +1100
Subject: nv40: move hw_dirty

---
 src/gallium/drivers/nv40/nv40_context.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/gallium/drivers/nv40/nv40_context.h')

diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index cbc798fbd6..c533b9e0ef 100644
--- a/src/gallium/drivers/nv40/nv40_context.h
+++ b/src/gallium/drivers/nv40/nv40_context.h
@@ -115,7 +115,9 @@ struct nv40_blend_state {
 struct nv40_state {
 	unsigned scissor_enabled;
 	unsigned stipple_enabled;
+	unsigned fp_samplers;
 
+	unsigned dirty;
 	struct nouveau_stateobj *hw[NV40_STATE_MAX];
 };
 
@@ -129,13 +131,10 @@ struct nv40_context {
 	int chipset;
 
 	unsigned dirty;
-	unsigned hw_dirty;
 
 	struct nv40_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
 	struct nv40_miptree *tex_miptree[PIPE_MAX_SAMPLERS];
 	unsigned dirty_samplers;
-	unsigned fp_samplers;
-	unsigned vp_samplers;
 
 	struct {
 		struct pipe_scissor_state scissor;
-- 
cgit v1.2.3