diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-11 17:43:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-11 17:43:25 +0200 |
| commit | 26dfcdba6c306d6312c598e4191449302329be68 (patch) | |
| tree | 2bf56b5a0eb2cc554833fdc6e08f2b59f1bfdabd /mesalib/src/glsl/ir.cpp | |
| parent | 2dc2880eacae3d52f4ab4bb5ec43c5bbf50c5c3f (diff) | |
| parent | ae06feae7876db47ff0e1fde40cf4a324a412037 (diff) | |
| download | vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.tar.gz vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.tar.bz2 vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/imports.h
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 f8f661d5e..dec49bd64 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -1333,7 +1333,7 @@ ir_dereference::is_lvalue() const } -static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod", "tg4", "query_levels" }; +static const char * const tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod", "tg4", "query_levels" }; const char *ir_texture::opcode_string() { |