fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tgsi/lowering: add support to lower TXP (v2)

Browse source 
v2: actually do perspective divide for RECT/SHADOWRECT

Signed-off-by: Rob Clark <robclark@freedesktop.org>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Rob Clark 2014-12-06 13:36:02 -05:00
parent f1b5f2b157
commit 219440ddeb
2 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/gallium/auxiliary/tgsi/tgsi_lowering.c
View file

@ -1031,7 +1031,10 @@ transform_samp(struct tgsi_transform_context *tctx,
struct tgsi_full_instruction new_inst; struct tgsi_full_instruction new_inst;
/* mask is clamped coords, pmask is all coords (for projection): */ /* mask is clamped coords, pmask is all coords (for projection): */
unsigned mask = 0, pmask = 0, smask; unsigned mask = 0, pmask = 0, smask;
unsigned tex = inst->Texture.Texture;
unsigned opcode = inst->Instruction.Opcode; unsigned opcode = inst->Instruction.Opcode;
bool lower_txp = (opcode == TGSI_OPCODE_TXP) &&
(ctx->config->lower_TXP & (1 << tex));
if (opcode == TGSI_OPCODE_TXB2) { if (opcode == TGSI_OPCODE_TXB2) {
samp = &inst->Src[2]; samp = &inst->Src[2];
@ -1043,14 +1046,14 @@ transform_samp(struct tgsi_transform_context *tctx,
smask = 1 << samp->Register.Index; smask = 1 << samp->Register.Index;
/* check if we actually need to lower this one: */ /* check if we actually need to lower this one: */
if (!(ctx->saturate & smask)) if (!(ctx->saturate & smask) && !lower_txp)
return -1; return -1;
/* figure out which coordinates need saturating: /* figure out which coordinates need saturating:
* - RECT textures should not get saturated * - RECT textures should not get saturated
* - array index coords should not get saturated * - array index coords should not get saturated
*/ */
switch (inst->Texture.Texture) { switch (tex) {
case TGSI_TEXTURE_3D: case TGSI_TEXTURE_3D:
case TGSI_TEXTURE_CUBE: case TGSI_TEXTURE_CUBE:
case TGSI_TEXTURE_CUBE_ARRAY: case TGSI_TEXTURE_CUBE_ARRAY:
@ -1081,16 +1084,19 @@ transform_samp(struct tgsi_transform_context *tctx,
pmask |= TGSI_WRITEMASK_X; pmask |= TGSI_WRITEMASK_X;
break; break;
/* TODO: I think we should ignore these? case TGSI_TEXTURE_RECT:
case TGSI_TEXTURE_RECT: case TGSI_TEXTURE_SHADOWRECT:
case TGSI_TEXTURE_SHADOWRECT: /* we don't saturate, but in case of lower_txp we
*/ * still need to do the perspective divide:
*/
pmask = TGSI_WRITEMASK_XY;
break;
} }
/* sanity check.. driver could be asking to saturate a non- /* sanity check.. driver could be asking to saturate a non-
* existent coordinate component: * existent coordinate component:
*/ */
if (!mask) if (!mask && !lower_txp)
return -1; return -1;
/* MOV tmpA, src0 */ /* MOV tmpA, src0 */
@ -1126,8 +1132,10 @@ transform_samp(struct tgsi_transform_context *tctx,
} }
/* MOV_SAT tmpA.<mask>, tmpA */ /* MOV_SAT tmpA.<mask>, tmpA */
create_mov(tctx, &ctx->tmp[A].dst, &ctx->tmp[A].src, mask, if (mask) {
TGSI_SAT_ZERO_ONE); create_mov(tctx, &ctx->tmp[A].dst, &ctx->tmp[A].src, mask,
TGSI_SAT_ZERO_ONE);
}
/* modify the texture samp instruction to take fixed up coord: */ /* modify the texture samp instruction to take fixed up coord: */
new_inst = *inst; new_inst = *inst;
@ -1462,6 +1470,7 @@ tgsi_transform_lowering(const struct tgsi_lowering_config *config,
OPCS(DPH) || OPCS(DPH) ||
OPCS(DP2) || OPCS(DP2) ||
OPCS(DP2A) || OPCS(DP2A) ||
OPCS(TXP) ||
ctx.two_side_colors || ctx.two_side_colors ||
ctx.saturate)) ctx.saturate))
return NULL; return NULL;
@ -1529,12 +1538,19 @@ tgsi_transform_lowering(const struct tgsi_lowering_config *config,
newlen += DP2A_GROW * OPCS(DP2A); newlen += DP2A_GROW * OPCS(DP2A);
numtmp = MAX2(numtmp, DOTP_TMP); numtmp = MAX2(numtmp, DOTP_TMP);
} }
if (ctx.saturate) { if (ctx.saturate || config->lower_TXP) {
int n = info->opcode_count[TGSI_OPCODE_TEX] + int n = 0;
info->opcode_count[TGSI_OPCODE_TXP] +
info->opcode_count[TGSI_OPCODE_TXB] + if (ctx.saturate) {
info->opcode_count[TGSI_OPCODE_TXB2] + n = info->opcode_count[TGSI_OPCODE_TEX] +
info->opcode_count[TGSI_OPCODE_TXL]; info->opcode_count[TGSI_OPCODE_TXP] +
info->opcode_count[TGSI_OPCODE_TXB] +
info->opcode_count[TGSI_OPCODE_TXB2] +
info->opcode_count[TGSI_OPCODE_TXL];
} else if (config->lower_TXP) {
n = info->opcode_count[TGSI_OPCODE_TXP];
}
newlen += SAMP_GROW * n; newlen += SAMP_GROW * n;
numtmp = MAX2(numtmp, SAMP_TMP); numtmp = MAX2(numtmp, SAMP_TMP);
} }

3
src/gallium/auxiliary/tgsi/tgsi_lowering.h
View file

@ -69,6 +69,9 @@ struct tgsi_lowering_config
unsigned lower_DP2:1; unsigned lower_DP2:1;
unsigned lower_DP2A:1; unsigned lower_DP2A:1;
/* bitmask of (1 << TGSI_TEXTURE_type): */
unsigned lower_TXP;
/* To emulate certain texture wrap modes, this can be used /* To emulate certain texture wrap modes, this can be used
* to saturate the specified tex coord to [0.0, 1.0]. The * to saturate the specified tex coord to [0.0, 1.0]. The
* bits are according to sampler #, ie. if, for example: * bits are according to sampler #, ie. if, for example: