diff options
author | Wladimir J. van der Laan <[email protected]> | 2017-07-24 10:28:17 +0200 |
---|---|---|
committer | Christian Gmeiner <[email protected]> | 2017-08-06 20:44:02 +0200 |
commit | 39056b0e2ac10342d8a3a6000f12a510f5dbd773 (patch) | |
tree | 2af42477d466d63ab23518123737f70b0e52e760 /src/gallium/drivers/etnaviv/etnaviv_compiler.c | |
parent | 6c321c8b0b3547b0af0b0939391eef4dc8d2f873 (diff) |
etnaviv: Implement ICACHE
This patch adds support for large shaders on GC3000. For example the "terrain"
glmark benchmark with a large fragment shader will work after this.
If the GPU supports ICACHE, shaders larger than the available state area will
be uploaded to a bo of their own and instructed to be loaded from memory on
demand. Small shaders will be uploaded in the usual way. This mimics the
behavior of the blob.
On GPUs that don't support ICACHE, this patch should make no difference.
Signed-off-by: Wladimir J. van der Laan <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>
Diffstat (limited to 'src/gallium/drivers/etnaviv/etnaviv_compiler.c')
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_compiler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c b/src/gallium/drivers/etnaviv/etnaviv_compiler.c index 165ab74298a..f65a168672c 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c @@ -2277,7 +2277,7 @@ etna_compile_check_limits(struct etna_compile *c) /* round up number of uniforms, including immediates, in units of four */ int num_uniforms = c->imm_base / 4 + (c->imm_size + 3) / 4; - if (c->inst_ptr > c->specs->max_instructions) { + if (!c->specs->has_icache && c->inst_ptr > c->specs->max_instructions) { DBG("Number of instructions (%d) exceeds maximum %d", c->inst_ptr, c->specs->max_instructions); return false; @@ -2501,6 +2501,7 @@ etna_compile_shader(struct etna_shader_variant *v) v->vs_pointsize_out_reg = -1; v->ps_color_out_reg = -1; v->ps_depth_out_reg = -1; + v->needs_icache = c->inst_ptr > c->specs->max_instructions; copy_uniform_state_to_shader(c, v); if (c->info.processor == PIPE_SHADER_VERTEX) { |