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

etnaviv: Switch to max_registers 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-08-21 09:54:52 +02:00
committed by Marge Bot
parent 89e286892d
commit 8b0a409431
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1037,6 +1037,7 @@ emit_shader(struct etna_compile *c, unsigned *num_temps, unsigned *num_consts)
static bool
etna_compile_check_limits(struct etna_shader_variant *v)
{
const struct etna_core_info *info = v->shader->info;
const struct etna_specs *specs = v->shader->specs;
int max_uniforms = (v->stage == MESA_SHADER_VERTEX)
? specs->max_vs_uniforms
@@ -1048,9 +1049,9 @@ etna_compile_check_limits(struct etna_shader_variant *v)
return false;
}
if (v->num_temps > specs->max_registers) {
if (v->num_temps > info->gpu.max_registers) {
DBG("Number of registers (%d) exceeds maximum %d", v->num_temps,
specs->max_registers);
info->gpu.max_registers);
return false;
}

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

@@ -117,8 +117,6 @@ struct etna_specs {
uint32_t max_instructions;
/* maximum number of varyings */
unsigned max_varyings;
/* maximum number of registers */
unsigned max_registers;
/* maximum vertex uniforms */
unsigned max_vs_uniforms;
/* maximum pixel uniforms */

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

@@ -853,7 +853,6 @@ etna_get_specs(struct etna_screen *screen)
if (info->type == ETNA_CORE_GPU) {
instruction_count = info->gpu.max_instructions;
screen->specs.stream_count = info->gpu.stream_count;
screen->specs.max_registers = info->gpu.max_registers;
screen->specs.pixel_pipes = info->gpu.pixel_pipes;
screen->specs.max_varyings = MIN2(info->gpu.max_varyings, ETNA_NUM_VARYINGS);