AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Don't store uniform_count on Midgard

Browse Source 
We weren't reading it anywhere outside this function, no need to keep
the extra copy of the data around. Avoids a footgun since this field
isn't even used on Bifrost.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8973>
This commit is contained in:
Alyssa Rosenzweig
2021-02-09 19:09:43 -05:00
committed by Marge Bot
parent 10f06a2b70
commit 0b70ebc14c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/pan_assemble.c
+3 -3
View File
@@ -41,11 +41,12 @@
static void
pan_prepare_midgard_props(struct panfrost_shader_state *state,
panfrost_program *program,
gl_shader_stage stage)
{
pan_prepare(&state->properties, RENDERER_PROPERTIES);
state->properties.uniform_buffer_count = state->ubo_count;
state->properties.midgard.uniform_count = state->uniform_count;
state->properties.midgard.uniform_count = program->uniform_cutoff;
state->properties.midgard.shader_has_side_effects = state->writes_global;
/* TODO: Select the appropriate mode. Suppresing inf/nan works around
@@ -373,7 +374,6 @@ panfrost_shader_compile(struct panfrost_context *ctx,
if (outputs_written)
*outputs_written = s->info.outputs_written;
state->uniform_count = program->uniform_cutoff;
state->work_reg_count = program->work_register_count;
if (pan_is_bifrost(dev))
@@ -413,7 +413,7 @@ panfrost_shader_compile(struct panfrost_context *ctx,
if (pan_is_bifrost(dev))
pan_prepare_bifrost_props(state, program, stage);
else
pan_prepare_midgard_props(state, stage);
pan_prepare_midgard_props(state, program, stage);
state->properties.stencil_from_shader = state->writes_stencil;
state->properties.shader_contains_barrier = state->helper_invocations;
src/gallium/drivers/panfrost/pan_context.h
-1
View File
@@ -215,7 +215,6 @@ struct panfrost_shader_state {
struct MALI_PRELOAD preload;
/* Non-descript information */
unsigned uniform_count;
unsigned work_reg_count;
bool can_discard;
bool writes_point_size;