fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 18:38:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r300: Enable hardware 3D texture support. Fixes the stex3d demo.

Browse source
This commit is contained in:
Oliver McFadden 2007-05-11 21:40:00 +00:00
parent 67363327e5
commit 3f709f16ef
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/drivers/dri/r300/r300_tex.c
View file

@ -876,7 +876,6 @@ static void r300CompressedTexSubImage2D(GLcontext * ctx, GLenum target,
t->dirty_images[face] |= (1 << level);
}
#if ENABLE_HW_3D_TEXTURE
static void r300TexImage3D(GLcontext * ctx, GLenum target, GLint level,
GLint internalFormat,
GLint width, GLint height, GLint depth,
@ -930,9 +929,7 @@ static void r300TexImage3D(GLcontext * ctx, GLenum target, GLint level,
t->dirty_images[0] |= (1 << level);
}
}
#endif
#if ENABLE_HW_3D_TEXTURE
static void
r300TexSubImage3D(GLcontext * ctx, GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
@ -966,7 +963,6 @@ r300TexSubImage3D(GLcontext * ctx, GLenum target, GLint level,
t->dirty_images[0] |= (1 << level);
}
#endif
static void r300TexEnv(GLcontext * ctx, GLenum target,
GLenum pname, const GLfloat * param)
@ -1087,9 +1083,7 @@ static void r300BindTexture(GLcontext * ctx, GLenum target,
if ((target == GL_TEXTURE_1D)
|| (target == GL_TEXTURE_2D)
#if ENABLE_HW_3D_TEXTURE
|| (target == GL_TEXTURE_3D)
#endif
|| (target == GL_TEXTURE_CUBE_MAP)
|| (target == GL_TEXTURE_RECTANGLE_NV)) {
assert(texObj->DriverData != NULL);
@ -1150,18 +1144,10 @@ void r300InitTextureFuncs(struct dd_function_table *functions)
functions->ChooseTextureFormat = r300ChooseTextureFormat;
functions->TexImage1D = r300TexImage1D;
functions->TexImage2D = r300TexImage2D;
#if ENABLE_HW_3D_TEXTURE
functions->TexImage3D = r300TexImage3D;
#else
functions->TexImage3D = _mesa_store_teximage3d;
#endif
functions->TexSubImage1D = r300TexSubImage1D;
functions->TexSubImage2D = r300TexSubImage2D;
#if ENABLE_HW_3D_TEXTURE
functions->TexSubImage3D = r300TexSubImage3D;
#else
functions->TexSubImage3D = _mesa_store_texsubimage3d;
#endif
functions->NewTextureObject = r300NewTextureObject;
functions->BindTexture = r300BindTexture;
functions->DeleteTexture = r300DeleteTexture;

10
src/mesa/drivers/dri/r300/r300_texstate.c
View file

@ -420,7 +420,6 @@ static GLboolean enable_tex_2d(GLcontext * ctx, int unit)
return GL_TRUE;
}
#if ENABLE_HW_3D_TEXTURE
static GLboolean enable_tex_3d(GLcontext * ctx, int unit)
{
r300ContextPtr rmesa = R300_CONTEXT(ctx);
@ -445,7 +444,6 @@ static GLboolean enable_tex_3d(GLcontext * ctx, int unit)
return GL_TRUE;
}
#endif
static GLboolean enable_tex_cube(GLcontext * ctx, int unit)
{
@ -546,14 +544,10 @@ static GLboolean r300UpdateTextureUnit(GLcontext * ctx, int unit)
} else if (texUnit->_ReallyEnabled & (TEXTURE_1D_BIT | TEXTURE_2D_BIT)) {
return (enable_tex_2d(ctx, unit) &&
update_tex_common(ctx, unit));
}
#if ENABLE_HW_3D_TEXTURE
else if (texUnit->_ReallyEnabled & (TEXTURE_3D_BIT)) {
} else if (texUnit->_ReallyEnabled & (TEXTURE_3D_BIT)) {
return (enable_tex_3d(ctx, unit) &&
update_tex_common(ctx, unit));
}
#endif
else if (texUnit->_ReallyEnabled & (TEXTURE_CUBE_BIT)) {
} else if (texUnit->_ReallyEnabled & (TEXTURE_CUBE_BIT)) {
return (enable_tex_cube(ctx, unit) &&
update_tex_common(ctx, unit));
} else if (texUnit->_ReallyEnabled) {