summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolai Haehnle <prefect_@gmx.net>2005-06-21 15:21:14 +0000
committerNicolai Haehnle <prefect_@gmx.net>2005-06-21 15:21:14 +0000
commita5fb15cb87a0734f5e0bf1b1dafe5204a32052da (patch)
tree5345509c1e6dfe0ebbe29d7250e3cf0619badd01
parent04f863e85669fdf42f3ec401c55b1533e8069dee (diff)
Make sure texture base addresses are used correctly.
They are relative to the card's address space, not relative to fbLocation, which will be important once we program MC_FB/AGP_LOCATION in the way they are programmed on older Radeon chips.
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.h2
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index ab6660897c..7b575bd4d0 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -174,7 +174,7 @@ struct r300_tex_obj {
GLuint pitch; /* one of the unknown registers.. unknown 1 ?*/
GLuint size; /* npot only */
GLuint format;
- GLuint offset; /* Image location in texmem.
+ GLuint offset; /* Image location in the card's address space.
All cube faces follow. */
GLuint unknown4;
GLuint unknown5;
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 0e2652a370..d8feb19542 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1077,7 +1077,7 @@ void r300_setup_textures(GLcontext *ctx)
r300->hw.tex.size.cmd[R300_TEX_VALUE_0+i]=t->size;
r300->hw.tex.format.cmd[R300_TEX_VALUE_0+i]=t->format;
//fprintf(stderr, "t->format=%08x\n", t->format);
- r300->hw.tex.offset.cmd[R300_TEX_VALUE_0+i]=r300->radeon.radeonScreen->fbLocation+t->offset;
+ r300->hw.tex.offset.cmd[R300_TEX_VALUE_0+i]=t->offset;
r300->hw.tex.unknown4.cmd[R300_TEX_VALUE_0+i]=0x0;
r300->hw.tex.border_color.cmd[R300_TEX_VALUE_0+i]=t->pp_border_color;
}