projects / platform / upstream / VK-GL-CTS.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 18e2d30 8d9bc79)
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)
commiteadbd3995fd46a4c68d68c70aaf20d4179a17064
treeb76da93139f6b8603f0d700a94141747cba93ebdtree | snapshot
parent18e2d3038f622210cf876ef17d73060298b0ff89commit | diff
parent8d9bc7963ef237f6a0c1cfe25132cfe997ec27bbcommit | diff
Merge branch '149-eliminate-SSA-violation' into 'master'

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
Domain: Graphics System / GL;