From 5593a3d2f370e3e12a043110bf2e395c938980d6 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 3 Oct 2013 13:20:50 +0200 Subject: mesa xkeyboard-config git update 3 Oct 2003 xkeyboard-config commit 7c7f937a2203bdcdc3b2e7cbe55ddfc34cffe3ab mesa commit d1335926196c216f1abe73f37cfcb61cf7f2bd28 --- mesalib/src/glsl/ir_reader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesalib/src/glsl/ir_reader.cpp') diff --git a/mesalib/src/glsl/ir_reader.cpp b/mesalib/src/glsl/ir_reader.cpp index f0318ea21..8038b8f5d 100644 --- a/mesalib/src/glsl/ir_reader.cpp +++ b/mesalib/src/glsl/ir_reader.cpp @@ -947,6 +947,8 @@ ir_reader::read_texture(s_expression *expr) { "txf_ms", s_type, s_sampler, s_coord, s_sample_index }; s_pattern txs_pattern[] = { "txs", s_type, s_sampler, s_lod }; + s_pattern tg4_pattern[] = + { "tg4", s_type, s_sampler, s_coord, s_offset }; s_pattern other_pattern[] = { tag, s_type, s_sampler, s_coord, s_offset, s_proj, s_shadow, s_lod }; @@ -960,6 +962,8 @@ ir_reader::read_texture(s_expression *expr) op = ir_txf_ms; } else if (MATCH(expr, txs_pattern)) { op = ir_txs; + } else if (MATCH(expr, tg4_pattern)) { + op = ir_tg4; } else if (MATCH(expr, other_pattern)) { op = ir_texture::get_opcode(tag->value()); if (op == -1) @@ -1010,7 +1014,7 @@ ir_reader::read_texture(s_expression *expr) } } - if (op != ir_txf && op != ir_txf_ms && op != ir_txs && op != ir_lod) { + if (op != ir_txf && op != ir_txf_ms && op != ir_txs && op != ir_lod && op != ir_tg4) { s_int *proj_as_int = SX_AS_INT(s_proj); if (proj_as_int && proj_as_int->value() == 1) { tex->projector = NULL; -- cgit v1.2.3