From: Grazvydas Ignotas Date: Wed, 2 Sep 2015 22:54:30 +0000 (+0300) Subject: r600g: start numbering atoms from 1 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6ef4572937015c1e076afc12f19e8453d08babec;p=mesa.git 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 --- diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 5212db3c1a7..6f4cb55f887 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 bf6bd766097..9860eff35a5 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 6724cc080b5..93a74f7c2ca 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