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

r300: this code really shouldn't be here.

Browse source 
For R500 just ignore it for now while I do something interesting like
run glxgears.
This commit is contained in:
Dave Airlie 2008-03-20 14:30:59 +10:00 • committed by Corbin Simpson
parent 9d9f66cc8d
commit 99e75135ee
1 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/mesa/drivers/dri/r300/r300_state.c
View file

@ -1436,39 +1436,42 @@ static void r300SetupTextures(GLcontext * ctx)
if (!fp) /* should only happenen once, just after context is created */ if (!fp) /* should only happenen once, just after context is created */
return; return;
R300_STATECHANGE(r300, fpt);
for (i = 0; i < fp->tex.length; i++) { if (r300->radeon.radeonScreen->chip_family < CHIP_FAMILY_RV515) {
int unit; R300_STATECHANGE(r300, fpt);
int opcode;
unsigned long val;
unit = fp->tex.inst[i] >> R300_FPITX_IMAGE_SHIFT; for (i = 0; i < fp->tex.length; i++) {
unit &= 15; int unit;
int opcode;
unsigned long val;
val = fp->tex.inst[i]; unit = fp->tex.inst[i] >> R300_FPITX_IMAGE_SHIFT;
val &= ~R300_FPITX_IMAGE_MASK; unit &= 15;
opcode = val = fp->tex.inst[i];
(val & R300_FPITX_OPCODE_MASK) >> R300_FPITX_OPCODE_SHIFT; val &= ~R300_FPITX_IMAGE_MASK;
if (opcode == R300_FPITX_OP_KIL) {
r300->hw.fpt.cmd[R300_FPT_INSTR_0 + i] = val; opcode =
} else { (val & R300_FPITX_OPCODE_MASK) >> R300_FPITX_OPCODE_SHIFT;
if (tmu_mappings[unit] >= 0) { if (opcode == R300_FPITX_OP_KIL) {
val |=
tmu_mappings[unit] <<
R300_FPITX_IMAGE_SHIFT;
r300->hw.fpt.cmd[R300_FPT_INSTR_0 + i] = val; r300->hw.fpt.cmd[R300_FPT_INSTR_0 + i] = val;
} else { } else {
// We get here when the corresponding texture image is incomplete if (tmu_mappings[unit] >= 0) {
// (e.g. incomplete mipmaps etc.) val |=
r300->hw.fpt.cmd[R300_FPT_INSTR_0 + i] = val; tmu_mappings[unit] <<
R300_FPITX_IMAGE_SHIFT;
r300->hw.fpt.cmd[R300_FPT_INSTR_0 + i] = val;
} else {
// We get here when the corresponding texture image is incomplete
// (e.g. incomplete mipmaps etc.)
r300->hw.fpt.cmd[R300_FPT_INSTR_0 + i] = val;
}
} }
} }
}
r300->hw.fpt.cmd[R300_FPT_CMD_0] = r300->hw.fpt.cmd[R300_FPT_CMD_0] =
cmdpacket0(R300_PFS_TEXI_0, fp->tex.length); cmdpacket0(R300_PFS_TEXI_0, fp->tex.length);
}
if (RADEON_DEBUG & DEBUG_STATE) if (RADEON_DEBUG & DEBUG_STATE)
fprintf(stderr, "TX_ENABLE: %08x last_hw_tmu=%d\n", fprintf(stderr, "TX_ENABLE: %08x last_hw_tmu=%d\n",