From 0219d1168e14efc3277822f64aa3d822b7bf5bba Mon Sep 17 00:00:00 2001
From: Daniel Borca <dborca@users.sourceforge.net>
Date: Tue, 14 Oct 2003 14:56:45 +0000
Subject: minor fixes + doc update

---
 src/mesa/drivers/glide/fxdd.c    |  3 ++-
 src/mesa/drivers/glide/fxddtex.c | 12 +++++++++++-
 src/mesa/drivers/glide/fxdrv.h   |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 74fc496485..7087c30b66 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 77c7ef3c9e..346d3625b0 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 65c1e58ff2..204fef78ce 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);
 
-- 
cgit v1.2.3