summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/vc4/vc4_program.c
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2014-10-01 10:58:02 -0700
committerEric Anholt <[email protected]>2014-10-01 17:03:35 -0700
commit75f8e0bc2ae03154038c3f17fec1bcad699856e0 (patch)
treef26f766634f055573e3c9ed59e8e17cc0190751c /src/gallium/drivers/vc4/vc4_program.c
parentebff93ac19a5da3aedf6a4c16b2eb166447f70a1 (diff)
vc4: Make the last static array in vc4_program.c dynamically sized.
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_program.c')
-rw-r--r--src/gallium/drivers/vc4/vc4_program.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index 589d33ab1a0..c3da5fe2c6f 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -104,6 +104,18 @@ add_uniform(struct vc4_compile *c,
uint32_t uniform = c->num_uniforms++;
struct qreg u = { QFILE_UNIF, uniform };
+ if (uniform >= c->uniform_array_size) {
+ c->uniform_array_size = MAX2(MAX2(16, uniform + 1),
+ c->uniform_array_size * 2);
+
+ c->uniform_data = reralloc(c, c->uniform_data,
+ uint32_t,
+ c->uniform_array_size);
+ c->uniform_contents = reralloc(c, c->uniform_contents,
+ enum quniform_contents,
+ c->uniform_array_size);
+ }
+
c->uniform_contents[uniform] = contents;
c->uniform_data[uniform] = data;
@@ -1573,9 +1585,6 @@ vc4_shader_tgsi_to_qir(struct vc4_context *vc4,
c->stage = stage;
- c->uniform_data = ralloc_array(c, uint32_t, 1024);
- c->uniform_contents = ralloc_array(c, enum quniform_contents, 1024);
-
c->shader_state = key->shader_state;
ret = tgsi_parse_init(&c->parser, c->shader_state->tokens);
assert(ret == TGSI_PARSE_OK);