Merge branch 'jbolz_push_constants' into 'master'
authorPyry Haulos <phaulos@google.com>
Sun, 3 Jan 2016 21:50:12 +0000 (16:50 -0500)
committerPyry Haulos <phaulos@google.com>
Sun, 3 Jan 2016 21:50:12 +0000 (16:50 -0500)
Push constants fixes

Push Constant fixes: add location=0 on color I/O. Replace 'size 40' test with 'size 48', replacing two push constant blocks with one and using proper std140 alignment.

See merge request !206


Trivial merge