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

restored call to _mesa_select_tex_image() in _mesa_GetTexImage()

Browse source
This commit is contained in:
Brian Paul 2000-11-10 15:32:07 +00:00
parent 3d960a0d84
commit 8e3366fda7
1 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/mesa/main/teximage.c
View file

@ -1,4 +1,4 @@
/* $Id: teximage.c,v 1.60 2000/11/07 16:40:37 brianp Exp $ */
/* $Id: teximage.c,v 1.61 2000/11/10 15:32:07 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -1838,15 +1838,6 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
}
}
#define OLD_DD_TEXTURE
#ifdef OLD_DD_TEXTURE
/* XXX this will be removed in the future */
if (ctx->Driver.TexImage) {
(*ctx->Driver.TexImage)( ctx, target, texObj, level, internalFormat,
texImage );
}
#endif
/* state update */
gl_put_texobj_on_dirty_list( ctx, texObj );
ctx->NewState |= _NEW_TEXTURE;
@ -2206,6 +2197,7 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
return;
}
texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
if (!texImage) {
/* invalid mipmap level, not an error */
return;
@ -2528,19 +2520,6 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
FREE(texImage->Data);
texImage->Data = NULL;
}
#ifdef OLD_DD_TEXTURE
/* XXX this will be removed in the future */
if (ctx->Driver.TexSubImage) {
(*ctx->Driver.TexSubImage)(ctx, target, texObj, level,
xoffset, yoffset, width, height,
texImage->IntFormat, texImage);
}
else if (ctx->Driver.TexImage) {
(*ctx->Driver.TexImage)(ctx, GL_TEXTURE_2D, texObj,
level, texImage->IntFormat, texImage );
}
#endif
}
}