Merge branch '207-208-basic-compute-bugfix' into 'master'
authorPyry Haulos <phaulos@google.com>
Fri, 15 Jan 2016 17:00:04 +0000 (12:00 -0500)
committerPyry Haulos <phaulos@google.com>
Fri, 15 Jan 2016 17:00:04 +0000 (12:00 -0500)
commite477df6cc00c41b3f64393af04ae9a300a1dc3ee
treef864cd4f34f31340848482ff45e84cf95adad2fe
parentc71545d6425177916295ae86d90f39631678a111
parent216610c30374179b971ff5bf5ced63b1b36e70ce
Merge branch '207-208-basic-compute-bugfix' into 'master'

Basic compute: fix wrong enum and uninitialized atomic variable

Fixes #207 and #208

#207 was partially fixed by !281, but the same initialization logic was also needed in SSBO barrier test, so I'm adding it here.

See merge request !318