mesa/uniform_query: Don't write to *params if there is an error
authorMatt Turner <mattst88@gmail.com>
Sat, 8 Dec 2012 00:32:30 +0000 (16:32 -0800)
committerMatt Turner <mattst88@gmail.com>
Thu, 13 Dec 2012 17:53:28 +0000 (09:53 -0800)
commit11cea472466f731fa9c44d56f1643dec26e6601c
tree6b19a4d78fc09e6ccf5611ddf7310bc166d37947
parent6acabe33a35a75d008e33d5e01502a66b3bc6238
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.

NOTE: This is a candidate for the 9.0 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/mesa/main/uniform_query.cpp