diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-30 15:40:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-30 15:40:11 +0200 |
| commit | 22bc825e9931f718cc0564aa55915961abaffce4 (patch) | |
| tree | f53ea31eb5368d3f60860d3e8911fa83a7fd851a /mesalib/src/glsl/ir.cpp | |
| parent | ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f (diff) | |
| parent | 5ebbc3a366287b631775ed3e17537580d380db8a (diff) | |
| download | vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.tar.gz vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.tar.bz2 vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
Diffstat (limited to 'mesalib/src/glsl/ir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index 99dceacf8..c6d96d8da 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -515,6 +515,7 @@ static const char *const operator_strs[] = { "bfm", "ubo_load", "vector_extract", + "fma", "lrp", "bfi", "bitfield_extract", |