diff options
author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2020-11-18 15:54:16 +0100 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-12-14 15:13:13 +0000 |
commit | a5f4be4fcd54d7f3c3823b534220ab579c210231 (patch) | |
tree | 0bbe56c742b4f945bc0dfb0adc6f66fbf317eae5 | |
parent | fefbafb6ff305437ae7d4e47326a4c68247de3cd (diff) |
etnaviv: remove imm_ prefix from etna_shader_uniform_info members
This prefix is meaningless.
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8062>
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 16 | ||||
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c | 14 | ||||
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_context.h | 6 | ||||
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_disk_cache.c | 18 | ||||
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_emit.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_shader.c | 14 | ||||
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_uniforms.c | 22 |
7 files changed, 47 insertions, 47 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index 2c0d360c51c..be0b52757e5 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -183,13 +183,13 @@ copy_uniform_state_to_shader(struct etna_shader_variant *sobj, uint64_t *consts, { struct etna_shader_uniform_info *uinfo = &sobj->uniforms; - uinfo->imm_count = count * 4; - uinfo->imm_data = MALLOC(uinfo->imm_count * sizeof(*uinfo->imm_data)); - uinfo->imm_contents = MALLOC(uinfo->imm_count * sizeof(*uinfo->imm_contents)); + uinfo->count = count * 4; + uinfo->data = MALLOC(uinfo->count * sizeof(*uinfo->data)); + uinfo->contents = MALLOC(uinfo->count * sizeof(*uinfo->contents)); - for (unsigned i = 0; i < uinfo->imm_count; i++) { - uinfo->imm_data[i] = consts[i]; - uinfo->imm_contents[i] = consts[i] >> 32; + for (unsigned i = 0; i < uinfo->count; i++) { + uinfo->data[i] = consts[i]; + uinfo->contents[i] = consts[i] >> 32; } etna_set_shader_uniforms_dirty_flags(sobj); @@ -992,9 +992,9 @@ etna_compile_check_limits(struct etna_shader_variant *v) return false; } - if (v->uniforms.imm_count / 4 > max_uniforms) { + if (v->uniforms.count / 4 > max_uniforms) { DBG("Number of uniforms (%d) exceeds maximum %d", - v->uniforms.imm_count / 4, max_uniforms); + v->uniforms.count / 4, max_uniforms); return false; } diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c index 611c86ed7f5..743ee0b5ace 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c @@ -2290,17 +2290,17 @@ copy_uniform_state_to_shader(struct etna_compile *c, struct etna_shader_variant uint32_t count = c->imm_base + c->imm_size; struct etna_shader_uniform_info *uinfo = &sobj->uniforms; - uinfo->imm_count = count; + uinfo->count = count; - uinfo->imm_data = malloc(count * sizeof(*c->imm_data)); + uinfo->data = malloc(count * sizeof(*c->imm_data)); for (unsigned i = 0; i < c->imm_base; i++) - uinfo->imm_data[i] = i; - memcpy(&uinfo->imm_data[c->imm_base], c->imm_data, c->imm_size * sizeof(*c->imm_data)); + uinfo->data[i] = i; + memcpy(&uinfo->data[c->imm_base], c->imm_data, c->imm_size * sizeof(*c->imm_data)); - uinfo->imm_contents = malloc(count * sizeof(*c->imm_contents)); + uinfo->contents = malloc(count * sizeof(*c->imm_contents)); for (unsigned i = 0; i < c->imm_base; i++) - uinfo->imm_contents[i] = ETNA_UNIFORM_UNIFORM; - memcpy(&uinfo->imm_contents[c->imm_base], c->imm_contents, c->imm_size * sizeof(*c->imm_contents)); + uinfo->contents[i] = ETNA_UNIFORM_UNIFORM; + memcpy(&uinfo->contents[c->imm_base], c->imm_contents, c->imm_size * sizeof(*c->imm_contents)); etna_set_shader_uniforms_dirty_flags(sobj); } diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.h b/src/gallium/drivers/etnaviv/etnaviv_context.h index 7106806ea42..72000f2122b 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.h +++ b/src/gallium/drivers/etnaviv/etnaviv_context.h @@ -101,9 +101,9 @@ enum etna_uniform_contents { }; struct etna_shader_uniform_info { - enum etna_uniform_contents *imm_contents; - uint32_t *imm_data; - uint32_t imm_count; + enum etna_uniform_contents *contents; + uint32_t *data; + uint32_t count; }; struct etna_context { diff --git a/src/gallium/drivers/etnaviv/etnaviv_disk_cache.c b/src/gallium/drivers/etnaviv/etnaviv_disk_cache.c index 5b1844d8ebc..321cbe9c462 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_disk_cache.c +++ b/src/gallium/drivers/etnaviv/etnaviv_disk_cache.c @@ -102,25 +102,25 @@ retrieve_variant(struct blob_reader *blob, struct etna_shader_variant *v) v->code = malloc(4 * v->code_size); blob_copy_bytes(blob, v->code, 4 * v->code_size); - blob_copy_bytes(blob, &v->uniforms.imm_count, sizeof(v->uniforms.imm_count)); - v->uniforms.imm_contents = malloc(v->uniforms.imm_count * sizeof(v->uniforms.imm_contents)); - v->uniforms.imm_data = malloc(v->uniforms.imm_count * sizeof(v->uniforms.imm_data)); + blob_copy_bytes(blob, &v->uniforms.count, sizeof(v->uniforms.count)); + v->uniforms.contents = malloc(v->uniforms.count * sizeof(v->uniforms.contents)); + v->uniforms.data = malloc(v->uniforms.count * sizeof(v->uniforms.data)); - blob_copy_bytes(blob, v->uniforms.imm_contents, v->uniforms.imm_count * sizeof(v->uniforms.imm_contents)); - blob_copy_bytes(blob, v->uniforms.imm_data, v->uniforms.imm_count * sizeof(v->uniforms.imm_data)); + blob_copy_bytes(blob, v->uniforms.contents, v->uniforms.count * sizeof(v->uniforms.contents)); + blob_copy_bytes(blob, v->uniforms.data, v->uniforms.count * sizeof(v->uniforms.data)); } static void store_variant(struct blob *blob, const struct etna_shader_variant *v) { - const uint32_t imm_count = v->uniforms.imm_count; + const uint32_t imm_count = v->uniforms.count; blob_write_bytes(blob, VARIANT_CACHE_PTR(v), VARIANT_CACHE_SIZE); blob_write_bytes(blob, v->code, 4 * v->code_size); - blob_write_bytes(blob, &v->uniforms.imm_count, sizeof(v->uniforms.imm_count)); - blob_write_bytes(blob, v->uniforms.imm_contents, imm_count * sizeof(v->uniforms.imm_contents)); - blob_write_bytes(blob, v->uniforms.imm_data, imm_count * sizeof(v->uniforms.imm_data)); + blob_write_bytes(blob, &v->uniforms.count, sizeof(v->uniforms.count)); + blob_write_bytes(blob, v->uniforms.contents, imm_count * sizeof(v->uniforms.contents)); + blob_write_bytes(blob, v->uniforms.data, imm_count * sizeof(v->uniforms.data)); } bool diff --git a/src/gallium/drivers/etnaviv/etnaviv_emit.c b/src/gallium/drivers/etnaviv/etnaviv_emit.c index 934a739121c..a433d9db9bc 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_emit.c +++ b/src/gallium/drivers/etnaviv/etnaviv_emit.c @@ -105,8 +105,8 @@ required_stream_size(struct etna_context *ctx) size += ctx->vertex_elements->num_elements + 1; /* uniforms - worst case (2 words per uniform load) */ - size += ctx->shader.vs->uniforms.imm_count * 2; - size += ctx->shader.fs->uniforms.imm_count * 2; + size += ctx->shader.vs->uniforms.count * 2; + size += ctx->shader.fs->uniforms.count * 2; /* shader */ size += ctx->shader_state.vs_inst_mem_size + 1; diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c index e890b34061d..fc38bb06b66 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_shader.c +++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c @@ -71,13 +71,13 @@ etna_dump_shader(const struct etna_shader_variant *shader) printf("num loops: %i\n", shader->num_loops); printf("num temps: %i\n", shader->num_temps); printf("immediates:\n"); - for (int idx = 0; idx < shader->uniforms.imm_count; ++idx) { + for (int idx = 0; idx < shader->uniforms.count; ++idx) { printf(" [%i].%s = %f (0x%08x) (%d)\n", idx / 4, tgsi_swizzle_names[idx % 4], - *((float *)&shader->uniforms.imm_data[idx]), - shader->uniforms.imm_data[idx], - shader->uniforms.imm_contents[idx]); + *((float *)&shader->uniforms.data[idx]), + shader->uniforms.data[idx], + shader->uniforms.contents[idx]); } printf("inputs:\n"); for (int idx = 0; idx < shader->infile.num_reg; ++idx) { @@ -302,8 +302,8 @@ etna_destroy_shader(struct etna_shader_variant *shader) assert(shader); FREE(shader->code); - FREE(shader->uniforms.imm_data); - FREE(shader->uniforms.imm_contents); + FREE(shader->uniforms.data); + FREE(shader->uniforms.contents); FREE(shader); } @@ -389,7 +389,7 @@ dump_shader_info(struct etna_shader_variant *v, struct pipe_debug_callback *debu etna_shader_stage(v), v->code_size, v->num_temps, - v->uniforms.imm_count, + v->uniforms.count, v->num_loops); } diff --git a/src/gallium/drivers/etnaviv/etnaviv_uniforms.c b/src/gallium/drivers/etnaviv/etnaviv_uniforms.c index 5c85dcc15be..92d5665e973 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_uniforms.c +++ b/src/gallium/drivers/etnaviv/etnaviv_uniforms.c @@ -72,16 +72,16 @@ etna_uniforms_write(const struct etna_context *ctx, uint32_t base = frag ? screen->specs.ps_uniforms_offset : screen->specs.vs_uniforms_offset; unsigned idx; - if (!uinfo->imm_count) + if (!uinfo->count) return; - etna_cmd_stream_reserve(stream, align(uinfo->imm_count + 1, 2)); - etna_emit_load_state(stream, base >> 2, uinfo->imm_count, 0); + etna_cmd_stream_reserve(stream, align(uinfo->count + 1, 2)); + etna_emit_load_state(stream, base >> 2, uinfo->count, 0); - for (uint32_t i = 0; i < uinfo->imm_count; i++) { - uint32_t val = uinfo->imm_data[i]; + for (uint32_t i = 0; i < uinfo->count; i++) { + uint32_t val = uinfo->data[i]; - switch (uinfo->imm_contents[i]) { + switch (uinfo->contents[i]) { case ETNA_UNIFORM_CONSTANT: etna_cmd_stream_emit(stream, val); break; @@ -94,11 +94,11 @@ etna_uniforms_write(const struct etna_context *ctx, case ETNA_UNIFORM_TEXRECT_SCALE_X: case ETNA_UNIFORM_TEXRECT_SCALE_Y: etna_cmd_stream_emit(stream, - get_texrect_scale(ctx, frag, uinfo->imm_contents[i], val)); + get_texrect_scale(ctx, frag, uinfo->contents[i], val)); break; case ETNA_UNIFORM_UBO0_ADDR ... ETNA_UNIFORM_UBOMAX_ADDR: - idx = uinfo->imm_contents[i] - ETNA_UNIFORM_UBO0_ADDR; + idx = uinfo->contents[i] - ETNA_UNIFORM_UBO0_ADDR; etna_cmd_stream_reloc(stream, &(struct etna_reloc) { .bo = etna_resource(cb[idx].buffer)->bo, .flags = ETNA_RELOC_READ, @@ -112,7 +112,7 @@ etna_uniforms_write(const struct etna_context *ctx, } } - if ((uinfo->imm_count % 2) == 0) + if ((uinfo->count % 2) == 0) etna_cmd_stream_emit(stream, 0); } @@ -121,8 +121,8 @@ etna_set_shader_uniforms_dirty_flags(struct etna_shader_variant *sobj) { uint32_t dirty = 0; - for (uint32_t i = 0; i < sobj->uniforms.imm_count; i++) { - switch (sobj->uniforms.imm_contents[i]) { + for (uint32_t i = 0; i < sobj->uniforms.count; i++) { + switch (sobj->uniforms.contents[i]) { default: break; |