[Mesa-dev] [PATCH 3/4] 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 af71ad4..eef3e49 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -3443,7 +3443,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 5f56204..1962bc5 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -36,7 +36,7 @@
 #include "util/list.h"
 #include "util/u_transfer.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 3d0615c..f485f8d 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -3028,7 +3028,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