r600g: start numbering atoms from 1

There doesn't seem any reason to start from 4.
Start from 1 instead (0 is left reserved to catch uninitialized atoms).

Signed-off-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 5212db3c1a7dddf8220c251f9957da3d38719185..6f4cb55f887757f0ab3d05032d5ec5aaa06b8dc2 100644 (file)
--- 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 bf6bd766097ef496236208d7172ed88d35a195a3..9860eff35a503a3cc22ee4ea1731766d8402f671 100644 (file)
--- 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 6724cc080b5d37488c1f0c4a60a57455b554b7bf..93a74f7c2ca1c341f7480d434832fc567df00b35 100644 (file)
--- 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