From ffb53b4f0384fc811372644ce35471c0711eef9e Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 21 Dec 2012 21:33:37 +1300 Subject: glsl: add support for ARB_texture_multisample V2: - emit `sample` parameter properly for multisample texelFetch() - fix spurious whitespace change - introduce a new opcode ir_txf_ms rather than overloading the existing ir_txf further. This makes doing the right thing in the driver somewhat simpler. V3: - fix weird whitespace V4: - don't forget to include the new opcode in tex_opcode_strs[] (thanks Kenneth for spotting this) Signed-off-by: Chris Forbes [V2] Reviewed-by: Eric Anholt [V2] Reviewed-by: Paul Berry Reviewed-by: Ian Romanick --- src/glsl/ir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glsl/ir.cpp') diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index 717d6f6..2eb3af6 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -1307,7 +1307,7 @@ ir_dereference::is_lvalue() const } -static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txs" }; +static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs" }; const char *ir_texture::opcode_string() { -- cgit v1.1