st/mesa: shader image atoms must be before framebuffer update
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Tue, 16 Feb 2016 03:49:58 +0000 (22:49 -0500)
committerNicolai Hähnle <nicolai.haehnle@amd.com>
Wed, 9 Mar 2016 16:40:06 +0000 (11:40 -0500)
commit9f06e7f5c1711ca552b8ef1f292ac39cc1b07472
tree8a3b01404bc643d2dcd118b51084b83567b8914f
parent4eb416bd9d670f55fe9691bcd75950f728a0b782
st/mesa: shader image atoms must be before framebuffer update

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>
src/mesa/state_tracker/st_atom.c