On Thu, Dec 13, 2012 at 3:11 AM, Ian Romanick <i...@freedesktop.org> wrote: > On 12/08/2012 11:25 AM, Matt Turner wrote: >> >> Module: Mesa >> Branch: gles3 >> Commit: d7063e8ee25963d08de2cd4d4ba61260c8eca9ca >> URL: >> http://cgit.freedesktop.org/mesa/mesa/commit/?id=d7063e8ee25963d08de2cd4d4ba61260c8eca9ca >> >> Author: Matt Turner <matts...@gmail.com> >> Date: Fri Dec 7 16:32:30 2012 -0800 >> >> mesa/uniform_query: Don't write to *params if there is an error >> >> The GL 3.1 and ES 3.0 specs say of glGetActiveUniformsiv: >> "If an error occurs, nothing will be written to params." >> >> So, make a pass through the indices and check that they're valid before >> the pass that actually writes to params. Checking pname happens on the >> first iteration of the second loop. >> >> Fixes es3conform's getactiveuniformsiv_for_nonexistent_uniform_indices >> test. >> >> Reviewed-by: Brian Paul <bri...@vmware.com> >> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> > > > This should just go directly to master too. Can you do that, and we can > rebase it out of gles3 soon? Also, please add
Done for both. > NOTE: This is a candidate for the 9.0 branch. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
