fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 00:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Clean up emit_tex a bit.

Browse source
This commit is contained in:
Eric Anholt 2009-11-13 15:16:17 -08:00
parent 3d36d6b4cf
commit a0fd49b334
1 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/mesa/drivers/dri/i965/brw_wm_emit.c
View file

@ -828,8 +828,8 @@ static void emit_tex( struct brw_wm_compile *c,
struct brw_reg *arg ) struct brw_reg *arg )
{ {
struct brw_compile *p = &c->func; struct brw_compile *p = &c->func;
GLuint msgLength, responseLength; GLuint cur_mrf = 2, response_length;
GLuint i, nr; GLuint i, nr_texcoords;
GLuint emit; GLuint emit;
GLuint msg_type; GLuint msg_type;
@ -838,17 +838,17 @@ static void emit_tex( struct brw_wm_compile *c,
switch (inst->tex_idx) { switch (inst->tex_idx) {
case TEXTURE_1D_INDEX: case TEXTURE_1D_INDEX:
emit = WRITEMASK_X; emit = WRITEMASK_X;
nr = 1; nr_texcoords = 1;
break; break;
case TEXTURE_2D_INDEX: case TEXTURE_2D_INDEX:
case TEXTURE_RECT_INDEX: case TEXTURE_RECT_INDEX:
emit = WRITEMASK_XY; emit = WRITEMASK_XY;
nr = 2; nr_texcoords = 2;
break; break;
case TEXTURE_3D_INDEX: case TEXTURE_3D_INDEX:
case TEXTURE_CUBE_INDEX: case TEXTURE_CUBE_INDEX:
emit = WRITEMASK_XYZ; emit = WRITEMASK_XYZ;
nr = 3; nr_texcoords = 3;
break; break;
default: default:
/* unexpected target */ /* unexpected target */
@ -857,31 +857,28 @@ static void emit_tex( struct brw_wm_compile *c,
/* For shadow comparisons, we have to supply u,v,r. */ /* For shadow comparisons, we have to supply u,v,r. */
if (inst->tex_shadow) if (inst->tex_shadow)
nr = 3; nr_texcoords = 3;
msgLength = 1; for (i = 0; i < nr_texcoords; i++) {
for (i = 0; i < nr; i++) {
if (emit & (1<<i)) if (emit & (1<<i))
brw_MOV(p, brw_message_reg(msgLength+1), arg[i]); brw_MOV(p, brw_message_reg(cur_mrf), arg[i]);
else else
brw_MOV(p, brw_message_reg(msgLength+1), brw_imm_f(0)); brw_MOV(p, brw_message_reg(cur_mrf), brw_imm_f(0));
msgLength += 2; cur_mrf += 2;
}
/* Fill in the cube map array index value. */
if (BRW_IS_IGDNG(p->brw) && inst->tex_shadow) {
brw_MOV(p, brw_message_reg(msgLength+1), brw_imm_f(0));
msgLength += 2;
} }
/* Fill in the shadow comparison reference value. */ /* Fill in the shadow comparison reference value. */
if (inst->tex_shadow) { if (inst->tex_shadow) {
brw_MOV(p, brw_message_reg(msgLength+1), arg[2]); if (BRW_IS_IGDNG(p->brw)) {
msgLength += 2; /* Fill in the cube map array index value. */
brw_MOV(p, brw_message_reg(cur_mrf), brw_imm_f(0));
cur_mrf += 2;
}
brw_MOV(p, brw_message_reg(cur_mrf), arg[2]);
cur_mrf += 2;
} }
responseLength = 8; /* always */ response_length = 8; /* always */
if (BRW_IS_IGDNG(p->brw)) { if (BRW_IS_IGDNG(p->brw)) {
if (inst->tex_shadow) if (inst->tex_shadow)
@ -895,19 +892,19 @@ static void emit_tex( struct brw_wm_compile *c,
msg_type = BRW_SAMPLER_MESSAGE_SIMD16_SAMPLE; msg_type = BRW_SAMPLER_MESSAGE_SIMD16_SAMPLE;
} }
brw_SAMPLE(p, brw_SAMPLE(p,
retype(vec16(dst[0]), BRW_REGISTER_TYPE_UW), retype(vec16(dst[0]), BRW_REGISTER_TYPE_UW),
1, 1,
retype(c->payload.depth[0].hw_reg, BRW_REGISTER_TYPE_UW), retype(c->payload.depth[0].hw_reg, BRW_REGISTER_TYPE_UW),
SURF_INDEX_TEXTURE(inst->tex_unit), SURF_INDEX_TEXTURE(inst->tex_unit),
inst->tex_unit, /* sampler */ inst->tex_unit, /* sampler */
inst->writemask, inst->writemask,
msg_type, msg_type,
responseLength, response_length,
msgLength, cur_mrf - 1,
0, 0,
1, 1,
BRW_SAMPLER_SIMD_MODE_SIMD16); BRW_SAMPLER_SIMD_MODE_SIMD16);
} }