r300/compiler: fix buffer underflow when setting SEM_WAIT on last instruction

Do it after we check whether inst_end != -1.
Also move the code structure at the beginning of r300_fragment_shader_code
to detect underflows easily with valgrind.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gallium/drivers/r300/r300_fs.h b/src/gallium/drivers/r300/r300_fs.h
index 45c9e8801c3..39eb73da65d 100644
--- a/src/gallium/drivers/r300/r300_fs.h
+++ b/src/gallium/drivers/r300/r300_fs.h
@@ -31,6 +31,7 @@
 #include "r300_shader_semantics.h"
 
 struct r300_fragment_shader_code {
+    struct rX00_fragment_program_code code;
     struct tgsi_shader_info info;
     struct r300_shader_semantics inputs;
 
@@ -48,7 +49,6 @@ struct r300_fragment_shader_code {
     uint32_t us_out_w;          /* R300_US_W_FMT:     0x46b4 */
 
     struct r300_fragment_program_external_state compare_state;
-    struct rX00_fragment_program_code code;
 
     unsigned cb_code_size;
     uint32_t *cb_code;