gallium: move, increase ST_MAX_SHADER_TOKENS

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 958096f68e67347ccfea80f4ddd8c7993e0ea1a6..5966bbadae892c6d1c2c1a5ddf170cf4b6454531 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -49,6 +49,9 @@
 #include "cso_cache/cso_context.h"
 
 
+#define ST_MAX_SHADER_TOKENS 4096
+
+
 #define TGSI_DEBUG 0
 
 
@@ -296,6 +299,8 @@ st_translate_vertex_program(struct st_context *st,
                                 /* tokenized result */
                                 tokens, ST_MAX_SHADER_TOKENS);
 
+   assert(num_tokens < ST_MAX_SHADER_TOKENS);
+
    vs.tokens = (struct tgsi_token *)
       mem_dup(tokens, num_tokens * sizeof(tokens[0]));
 
@@ -467,6 +472,8 @@ st_translate_fragment_program(struct st_context *st,
                                 /* tokenized result */
                                 tokens, ST_MAX_SHADER_TOKENS);
 
+   assert(num_tokens < ST_MAX_SHADER_TOKENS);
+
    fs.tokens = (struct tgsi_token *)
       mem_dup(tokens, num_tokens * sizeof(tokens[0]));
 

diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index bf07a50789eb30a64277aa4928330b75d129baa2..086e9391aa956f8443aaf8264b384e53175f5c8b 100644 (file)
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -39,9 +39,6 @@
 #include "pipe/p_shader_tokens.h"
 
 
-#define ST_MAX_SHADER_TOKENS 1024
-
-
 struct cso_fragment_shader;
 struct cso_vertex_shader;
 struct translated_vertex_program;