From 9f06e7f5c1711ca552b8ef1f292ac39cc1b07472 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Mon, 15 Feb 2016 22:49:58 -0500 Subject: [PATCH] st/mesa: shader image atoms must be before framebuffer update MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The reason is that the shader image atoms call st_finalize_texture, which may set ST_NEW_FRAMEBUFFER. This fixes an assertion triggered by a subtest of piglit's arb_shader_image_load_store-invalid. v2: add comment explaining order constraints (suggested by Ilia) Reviewed-by: Ilia Mirkin Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_atom.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c index 622621b..fc80adf 100644 --- a/src/mesa/state_tracker/st_atom.c +++ b/src/mesa/state_tracker/st_atom.c @@ -62,7 +62,12 @@ static const struct st_tracked_state *render_atoms[] = &st_update_tessctrl_texture, &st_update_tesseval_texture, &st_update_sampler, /* depends on update_*_texture for swizzle */ - &st_update_framebuffer, + &st_bind_vs_images, + &st_bind_tcs_images, + &st_bind_tes_images, + &st_bind_gs_images, + &st_bind_fs_images, + &st_update_framebuffer, /* depends on update_*_texture and bind_*_images */ &st_update_msaa, &st_update_sample_shading, &st_update_vs_constants, @@ -85,11 +90,6 @@ static const struct st_tracked_state *render_atoms[] = &st_bind_tes_ssbos, &st_bind_fs_ssbos, &st_bind_gs_ssbos, - &st_bind_vs_images, - &st_bind_tcs_images, - &st_bind_tes_images, - &st_bind_gs_images, - &st_bind_fs_images, &st_update_pixel_transfer, &st_update_tess, -- 2.7.4