summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/r300_tex.c
diff options
context:
space:
mode:
authorAapo Tahkola <aet@rasterburn.org>2006-01-26 15:53:18 +0000
committerAapo Tahkola <aet@rasterburn.org>2006-01-26 15:53:18 +0000
commitedc98df891d8962e607de3a10a68fa81598ceee2 (patch)
treee0f8c54c4a82fc5b3c71fbb15719d9e3859dbe6d /src/mesa/drivers/dri/r300/r300_tex.c
parentfbcb37cac5a3609365fe7ebd08051fc1cc528368 (diff)
Fix a problem where offsets from disabled tmus reach drm
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_tex.c')
-rw-r--r--src/mesa/drivers/dri/r300/r300_tex.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_tex.c b/src/mesa/drivers/dri/r300/r300_tex.c
index 4f84dacc41..d20c9a82ca 100644
--- a/src/mesa/drivers/dri/r300/r300_tex.c
+++ b/src/mesa/drivers/dri/r300/r300_tex.c
@@ -933,6 +933,7 @@ static void r300TexEnv(GLcontext * ctx, GLenum target,
*/
switch (pname) {
case GL_TEXTURE_LOD_BIAS_EXT:{
+#if 0 /* Needs to be relocated in order to make sure we got the right tmu */
GLfloat bias, min;
GLuint b;
@@ -957,6 +958,7 @@ static void r300TexEnv(GLcontext * ctx, GLenum target,
rmesa->hw.tex.unknown1.cmd[R300_TEX_VALUE_0+unit] &= ~R300_LOD_BIAS_MASK;
rmesa->hw.tex.unknown1.cmd[R300_TEX_VALUE_0+unit] |= b;
}
+#endif
break;
}
@@ -1085,6 +1087,7 @@ static struct gl_texture_object *r300NewTextureObject(GLcontext * ctx,
return obj;
}
+
void r300InitTextureFuncs(struct dd_function_table *functions)
{
/* Note: we only plug in the functions we implement in the driver