OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: shader image atoms must be before framebuffer update

Browse Source 
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 <imirkin@alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2016-02-15 22:49:58 -05:00
parent 4eb416bd9d
commit 9f06e7f5c1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/state_tracker/st_atom.c
View File

@@ -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,