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/mesa/state_tracker | |
| 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/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 4e29e4500..37779d4e5 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -1972,6 +1972,7 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir) case ir_unop_find_msb: case ir_unop_find_lsb: case ir_binop_bfm: + case ir_triop_fma: case ir_triop_bfi: case ir_triop_bitfield_extract: case ir_quadop_bitfield_insert: |