From 0219d1168e14efc3277822f64aa3d822b7bf5bba Mon Sep 17 00:00:00 2001 From: Daniel Borca Date: Tue, 14 Oct 2003 14:56:45 +0000 Subject: [PATCH] minor fixes + doc update --- docs/README.3DFX | 18 ++++++++++++++++++ src/mesa/drivers/glide/fxdd.c | 3 ++- src/mesa/drivers/glide/fxddtex.c | 12 +++++++++++- src/mesa/drivers/glide/fxdrv.h | 3 ++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/docs/README.3DFX b/docs/README.3DFX index 817faaa39a1..1ccb766fd25 100644 --- a/docs/README.3DFX +++ b/docs/README.3DFX @@ -3,6 +3,24 @@ +Mesa-5.1 release notes: +----------------------- + +1) Glide2 support has been ceased; in order to keep Voodoo Graphics, Voodoo2 + and Voodoo Rush compatibility, please visit the Glide SourceForge and help + us to fix Glide3 for those cards. +2) The non-DRI Linux build is currently broken. Any help will be appreciated. +3) Glide3 can be found at http://sourceforge.net/projects/glide/ + +Known supported HW: Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5 5500 +Known supported OS: DOS (DJGPP), Windows9x/2k (MinGW/MSVC), Linux+DRI + +Comments, notes, flames: +Daniel Borca +Hiroshi Morii + + + Info for Mesa 4.1 ----------------- diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c index 74fc496485d..7087c30b667 100644 --- a/src/mesa/drivers/glide/fxdd.c +++ b/src/mesa/drivers/glide/fxdd.c @@ -2,7 +2,7 @@ * fxDDReadPixels888 does not convert 8A8R8G8B into 5R5G5B */ -/* $Id: fxdd.c,v 1.102 2003/10/13 11:14:58 dborca Exp $ */ +/* $Id: fxdd.c,v 1.103 2003/10/14 14:56:45 dborca Exp $ */ /* * Mesa 3-D graphics library @@ -1383,6 +1383,7 @@ fxSetupDDPointers(GLcontext * ctx) ctx->Driver.TexParameter = fxDDTexParam; ctx->Driver.BindTexture = fxDDTexBind; ctx->Driver.DeleteTexture = fxDDTexDel; + ctx->Driver.IsTextureResident = fxDDIsTextureResident; ctx->Driver.UpdateTexturePalette = fxDDTexPalette; ctx->Driver.AlphaFunc = fxDDAlphaFunc; ctx->Driver.BlendFunc = fxDDBlendFunc; diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index 77c7ef3c9e9..346d3625b01 100644 --- a/src/mesa/drivers/glide/fxddtex.c +++ b/src/mesa/drivers/glide/fxddtex.c @@ -1,4 +1,4 @@ -/* $Id: fxddtex.c,v 1.50 2003/10/13 11:14:58 dborca Exp $ */ +/* $Id: fxddtex.c,v 1.51 2003/10/14 14:56:45 dborca Exp $ */ /* * Mesa 3-D graphics library @@ -354,6 +354,16 @@ fxDDTexDel(GLcontext * ctx, struct gl_texture_object *tObj) tObj->DriverData = NULL; } +/* + * Return true if texture is resident, false otherwise. + */ +GLboolean +fxDDIsTextureResident(GLcontext *ctx, struct gl_texture_object *tObj) +{ + tfxTexInfo *ti = fxTMGetTexInfo(tObj); + return (ti && ti->isInTM); +} + /* diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h index 65c1e58ff25..204fef78ce3 100644 --- a/src/mesa/drivers/glide/fxdrv.h +++ b/src/mesa/drivers/glide/fxdrv.h @@ -1,4 +1,4 @@ -/* $Id: fxdrv.h,v 1.60 2003/10/09 15:12:21 dborca Exp $ */ +/* $Id: fxdrv.h,v 1.61 2003/10/14 14:56:45 dborca Exp $ */ /* * Mesa 3-D graphics library @@ -590,6 +590,7 @@ extern void fxDDTexParam(GLcontext *, GLenum, struct gl_texture_object *, GLenum, const GLfloat *); extern void fxDDTexBind(GLcontext *, GLenum, struct gl_texture_object *); extern void fxDDTexDel(GLcontext *, struct gl_texture_object *); +extern GLboolean fxDDIsTextureResident(GLcontext *, struct gl_texture_object *); extern void fxDDTexPalette(GLcontext *, struct gl_texture_object *); extern void fxDDTexUseGlbPalette(GLcontext *, GLboolean); -- 2.11.0