i965/fs: Don't overwrite fs_visitor::uniforms and ::param_size during the SIMD16...
authorFrancisco Jerez <currojerez@riseup.net>
Tue, 5 May 2015 19:12:03 +0000 (22:12 +0300)
committerFrancisco Jerez <currojerez@riseup.net>
Wed, 29 Jul 2015 11:12:49 +0000 (14:12 +0300)
commit3e5a90792d14aeb599dd236f830e6e344b35c905
tree113416b2ee24bcc9f540d9e66ca61f56316d0aea
parentea0ac53f059c418d5797c495b87020f2ca2ec842
i965/fs: Don't overwrite fs_visitor::uniforms and ::param_size during the SIMD16 run.

Image variables need to allocate additional uniform slots over
nir_shader::num_uniforms.  nir_setup_uniforms() overwrites the values
imported from the SIMD8 visitor and then exits early before entering
the nir_shader::uniforms loop, so image uniforms are never re-created.
Instead leave the imported values alone, they *must* be the same for
the uniform layout of both runs to be compatible.

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
src/mesa/drivers/dri/i965/brw_fs_nir.cpp