diff options
| author | Alyssa Rosenzweig <[email protected]> | 2019-10-27 19:46:21 -0400 |
|---|---|---|
| committer | Tomeu Vizoso <[email protected]> | 2019-10-29 13:02:53 +0000 |
| commit | fa14cdf6e488cc14ca5953389bbdba3b0b27daf6 (patch) | |
| tree | 49e4180e3b263e7febb185bec8ff5927091ef573 /src/gallium | |
| parent | b4f508ab5990118ea0b9214d0933e0799c36d1f7 (diff) | |
panfrost: Cleanup _shader_upper -> shader
I don't believe this is actually a tagged pointer; warn if it is.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/panfrost/pan_context.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index 8cb34dc0581..69b3b96295d 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -888,14 +888,14 @@ panfrost_patch_shader_state_compute( struct panfrost_shader_variants *all = ctx->shader[stage]; if (!all) { - ctx->payloads[stage].postfix._shader_upper = 0; + ctx->payloads[stage].postfix.shader = 0; return; } struct panfrost_shader_state *s = &all->variants[all->active_variant]; - ctx->payloads[stage].postfix._shader_upper = - panfrost_patch_shader_state(ctx, s, stage, should_upload) >> 4; + ctx->payloads[stage].postfix.shader = + panfrost_patch_shader_state(ctx, s, stage, should_upload); } /* Go through dirty flags and actualise them in the cmdstream. */ @@ -1060,7 +1060,7 @@ panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data) struct panfrost_transfer transfer = panfrost_allocate_transient(batch, size); memcpy(transfer.cpu, &ctx->fragment_shader_core, sizeof(struct mali_shader_meta)); - ctx->payloads[PIPE_SHADER_FRAGMENT].postfix._shader_upper = (transfer.gpu) >> 4; + ctx->payloads[PIPE_SHADER_FRAGMENT].postfix.shader = transfer.gpu; if (!screen->require_sfbd) { /* Additional blend descriptor tacked on for jobs using MFBD */ |