Merge branch '149-eliminate-SSA-violation' into 'master'
authorPyry Haulos <phaulos@google.com>
Thu, 7 Jan 2016 19:22:03 +0000 (14:22 -0500)
committerPyry Haulos <phaulos@google.com>
Thu, 7 Jan 2016 19:22:03 +0000 (14:22 -0500)
Eliminate SSA violation in spirv_assembly.instruction.graphics.opquantize

Due to a bad merge in 0644efb693c3612681bda085bcbbdb31a115568b, there
was an extra assignment to %cond.

Also fix two accidentally swapped comments.

See merge request !244


Trivial merge