From d2dbba87554d9490b49884185a29ca2b46e4a616 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 22 Nov 2012 22:13:46 +1300 Subject: [PATCH] i965: fs: Add fixup for textureSize on Gen6/7 V2: Moved up into emit(ir_texture *) to avoid duplication and fix ordering for Gen7; Gen6 math quirks moved into previous patches. Tested on Gen6 only; passes all the cube_map_array piglits. V3: Fixed weird whitespace V4: Use sampler->type; otherwise broken on arrays of samplers. v5: Minor style fixes (by anholt) Signed-off-by: Chris Forbes Reviewed-by: Eric Anholt Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 6a39f98..708677f 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -1371,6 +1371,17 @@ fs_visitor::visit(ir_texture *ir) if (ir->shadow_comparitor) inst->shadow_compare = true; + /* fixup #layers for cube map arrays */ + if (ir->op == ir_txs) { + glsl_type const *type = ir->sampler->type; + if (type->sampler_dimensionality == GLSL_SAMPLER_DIM_CUBE && + type->sampler_array) { + fs_reg depth = dst; + depth.reg_offset = 2; + emit_math(SHADER_OPCODE_INT_QUOTIENT, depth, depth, fs_reg(6)); + } + } + swizzle_result(ir, dst, sampler); } -- 2.7.4