From f6a3fda25d2d9cf825c38e3e46f7cf44bd7c99e1 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 22 Nov 2012 21:32:08 +1300 Subject: [PATCH] i965: vs: Add fixup for textureSize with cube array samplers V3: Fixed weird whitespace V4: Use sampler's type rather than variable's type; otherwise broken with arrays of samplers. (Thanks Eric) v5: Fix a couple more style nits (by anholt) Signed-off-by: Chris Forbes Reviewed-by: Eric Anholt Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 97593d090b1..104057cf119 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -2117,6 +2117,19 @@ vec4_visitor::visit(ir_texture *ir) emit(inst); + /* fixup num layers (z) for cube arrays: hardware returns faces * layers; + * spec requires layers. + */ + if (ir->op == ir_txs) { + glsl_type const *type = ir->sampler->type; + if (type->sampler_dimensionality == GLSL_SAMPLER_DIM_CUBE && + type->sampler_array) { + emit_math(SHADER_OPCODE_INT_QUOTIENT, + with_writemask(inst->dst, WRITEMASK_Z), + src_reg(inst->dst), src_reg(6)); + } + } + swizzle_result(ir, src_reg(inst->dst), sampler); } -- 2.30.2