OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

etnaviv: Switch to vertex_output_buffer_size from etna_core_info

Browse Source 
Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30806>
This commit is contained in:
Christian Gmeiner
2024-07-30 23:27:59 +02:00
committed by Marge Bot
parent d5b4758417
commit 226e7d952f
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
View File

@@ -1067,7 +1067,6 @@ static void
fill_vs_mystery(struct etna_shader_variant *v) fill_vs_mystery(struct etna_shader_variant *v)
{ {
const struct etna_core_info *info = v->shader->info; const struct etna_core_info *info = v->shader->info;
const struct etna_specs *specs = v->shader->specs;
v->input_count_unk8 = DIV_ROUND_UP(v->infile.num_reg + 4, 16); /* XXX what is this */ v->input_count_unk8 = DIV_ROUND_UP(v->infile.num_reg + 4, 16); /* XXX what is this */
@@ -1093,7 +1092,7 @@ fill_vs_mystery(struct etna_shader_variant *v)
int half_out = v->outfile.num_reg / 2 + 1; int half_out = v->outfile.num_reg / 2 + 1;
assert(half_out); assert(half_out);
uint32_t b = ((20480 / (specs->vertex_output_buffer_size - uint32_t b = ((20480 / (info->gpu.vertex_output_buffer_size -
2 * half_out * info->gpu.vertex_cache_size)) + 2 * half_out * info->gpu.vertex_cache_size)) +
9) / 9) /
10; 10;

2
src/gallium/drivers/etnaviv/etnaviv_internal.h
View File

@@ -101,8 +101,6 @@ struct etna_specs {
unsigned fragment_sampler_count; unsigned fragment_sampler_count;
/* number of vertex sampler units */ /* number of vertex sampler units */
unsigned vertex_sampler_count; unsigned vertex_sampler_count;
/* size of vertex shader output buffer */
unsigned vertex_output_buffer_size;
/* maximum number of vertex element configurations */ /* maximum number of vertex element configurations */
unsigned vertex_max_elements; unsigned vertex_max_elements;
/* number of vertex streams */ /* number of vertex streams */

1
src/gallium/drivers/etnaviv/etnaviv_screen.c
View File

@@ -852,7 +852,6 @@ etna_get_specs(struct etna_screen *screen)
/* Copy all relevant limits from etna_core_info. */ /* Copy all relevant limits from etna_core_info. */
if (info->type == ETNA_CORE_GPU) { if (info->type == ETNA_CORE_GPU) {
instruction_count = info->gpu.max_instructions; instruction_count = info->gpu.max_instructions;
screen->specs.vertex_output_buffer_size = info->gpu.vertex_output_buffer_size;
screen->specs.stream_count = info->gpu.stream_count; screen->specs.stream_count = info->gpu.stream_count;
screen->specs.max_registers = info->gpu.max_registers; screen->specs.max_registers = info->gpu.max_registers;
screen->specs.pixel_pipes = info->gpu.pixel_pipes; screen->specs.pixel_pipes = info->gpu.pixel_pipes;