OSDN Git Service

glsl/builtins: Add missing mix(genType, genType, bvec) built-ins.
authorKenneth Graunke <kenneth@whitecape.org>
Thu, 5 Jan 2012 21:28:56 +0000 (13:28 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Sat, 7 Jan 2012 02:18:15 +0000 (18:18 -0800)
commitbe21ded2aef97b134379dd92b67e5e206720c1b1
tree4bea049265ef72f5f3bc797507a2117b5cb33edb
parent7ccf04ebcf6284a68ab6c571dabc5f3e0c6b740b
glsl/builtins: Add missing mix(genType, genType, bvec) built-ins.

The IR for mix(float, float, bool) was missing a write mask, causing the
IR reader to die horribly.  Furthermore, I neglected to add any of the
new prototypes to the 1.30 profiles.

Fixes oglconform's glsl-bif-com advanced.mix test cases.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44477
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/glsl/builtins/ir/mix.ir
src/glsl/builtins/profiles/130.frag
src/glsl/builtins/profiles/130.vert