[Mesa-dev] [PATCH 4/6] r600g: start numbering atoms from 1

[Grazvydas Ignotas]

There doesn't seem any reason to start from 4.
Start from 1 instead (0 is left reserved to catch uninitialized atoms).
---
 src/gallium/drivers/r600/evergreen_state.c | 2 +-
 src/gallium/drivers/r600/r600_pipe.h       | 2 +-
 src/gallium/drivers/r600/r600_state.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 5212db3..6f4cb55 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -3449,7 +3449,7 @@ fallback:
 
 void evergreen_init_state_functions(struct r600_context *rctx)
 {
-	unsigned id = 4;
+	unsigned id = 1;
 
 	/* !!!
 	 *  To avoid GPU lockup registers must be emited in a specific order
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index bf6bd76..9860eff 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -38,7 +38,7 @@
 
 #include "tgsi/tgsi_scan.h"
 
-#define R600_NUM_ATOMS 45
+#define R600_NUM_ATOMS 42
 
 #define R600_MAX_VIEWPORTS 16
 
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 6724cc0..93a74f7 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -3031,7 +3031,7 @@ fallback:
 
 void r600_init_state_functions(struct r600_context *rctx)
 {
-	unsigned id = 4;
+	unsigned id = 1;
 
 	/* !!!
 	 *  To avoid GPU lockup registers must be emited in a specific order
-- 
1.9.1