diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
| commit | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (patch) | |
| tree | 4b8d3a482e5905f6efb32f5843f1c6fc75d4fe19 /mesalib/src/glsl/ir.cpp | |
| parent | c3594c6c050a987fb891a1c7cf0c83102fbbec46 (diff) | |
| parent | 5593a3d2f370e3e12a043110bf2e395c938980d6 (diff) | |
| download | vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.gz vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.bz2 vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config git update 3 Oct 2003
Conflicts:
xorg-server/xkeyboard-config/symbols/level3
xorg-server/xkeyboard-config/symbols/level5
Diffstat (limited to 'mesalib/src/glsl/ir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index b0f92cb3f..81c6380ca 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -1374,7 +1374,7 @@ ir_dereference::is_lvalue() const } -static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod" }; +static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod", "tg4" }; const char *ir_texture::opcode_string() { |