From: Boris Brezillon Date: Thu, 5 Sep 2019 19:01:20 +0000 (+0200) Subject: panfrost: Delay payloads[].offset_start initialization X-Git-Tag: upstream/19.3.0~1955 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=835439b84fc0830447bc4c8c672c0acd237b2801;p=platform%2Fupstream%2Fmesa.git panfrost: Delay payloads[].offset_start initialization panfrost_draw_vbo() Might call the primeconvert/without_prim_restart helpers which will enter the ->draw_vbo() again. Let's delay payloads[].offset_start initialization so we don't initialize them twice. Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig --- diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index 745d42e..de11dae 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -1577,9 +1577,6 @@ panfrost_draw_vbo( if (panfrost_scissor_culls_everything(ctx)) return; - ctx->payloads[PIPE_SHADER_VERTEX].offset_start = info->start; - ctx->payloads[PIPE_SHADER_FRAGMENT].offset_start = info->start; - int mode = info->mode; /* Fallback unsupported restart index */ @@ -1610,6 +1607,9 @@ panfrost_draw_vbo( } } + ctx->payloads[PIPE_SHADER_VERTEX].offset_start = info->start; + ctx->payloads[PIPE_SHADER_FRAGMENT].offset_start = info->start; + /* Now that we have a guaranteed terminating path, find the job. * Assignment commented out to prevent unused warning */