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

st/mesa: restore pipe_draw_info::mode at the end of st_hw_select_draw_gallium

Browse Source 
This fixes possible incorrect rendering with lowered multi draws because
the first draw would override the prim type and the next draws would use
the overriden (incorrect) prim type.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26786>
This commit is contained in:
Marek Olšák
2022-12-31 12:25:32 -05:00
committed by Marge Bot
parent e40f5a7cb3
commit 3ad1c3eb7c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_draw.c
+7 -4
View File
@@ -443,12 +443,15 @@ st_hw_select_draw_gallium(struct gl_context *ctx,
unsigned num_draws)
{
struct st_context *st = st_context(ctx);
enum mesa_prim old_mode = info->mode;
if (!st_draw_hw_select_prepare_common(ctx) ||
!st_draw_hw_select_prepare_mode(ctx, info))
return;
if (st_draw_hw_select_prepare_common(ctx) &&
st_draw_hw_select_prepare_mode(ctx, info)) {
cso_draw_vbo(st->cso_context, info, drawid_offset, NULL, draws,
num_draws);
}
cso_draw_vbo(st->cso_context, info, drawid_offset, NULL, draws, num_draws);
info->mode = old_mode;
}
static void