summaryrefslogtreecommitdiff
path: root/src/mesa/main/texstate.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-08-01 17:33:53 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-08-01 17:33:53 +0000
commit390488d12ead1859b075caf80d337397d99436a2 (patch)
treeff3e2bc53345276849137d70a3eb7b3a416e281d /src/mesa/main/texstate.c
parent85dc4e7a773de62ea10e7c884c65909f192cf9bb (diff)
glGetTexParameter(GL_TEXTURE_RESIDENT) didn't query device driver
Diffstat (limited to 'src/mesa/main/texstate.c')
-rw-r--r--src/mesa/main/texstate.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 47cec1e4c5..e47589e3e7 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,8 +1,8 @@
-/* $Id: texstate.c,v 1.15 2000/07/05 16:14:24 brianp Exp $ */
+/* $Id: texstate.c,v 1.16 2000/08/01 17:33:53 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
+ * Version: 3.5
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -971,7 +971,14 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
params[3] = obj->BorderColor[3] / 255.0F;
break;
case GL_TEXTURE_RESIDENT:
- *params = ENUM_TO_FLOAT(GL_TRUE);
+ {
+ GLboolean resident;
+ if (ctx->Driver.IsTextureResident)
+ resident = ctx->Driver.IsTextureResident(ctx, obj);
+ else
+ resident = GL_TRUE;
+ *params = ENUM_TO_FLOAT(resident);
+ }
break;
case GL_TEXTURE_PRIORITY:
*params = obj->Priority;
@@ -1039,7 +1046,14 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
}
break;
case GL_TEXTURE_RESIDENT:
- *params = (GLint) GL_TRUE;
+ {
+ GLboolean resident;
+ if (ctx->Driver.IsTextureResident)
+ resident = ctx->Driver.IsTextureResident(ctx, obj);
+ else
+ resident = GL_TRUE;
+ *params = (GLint) resident;
+ }
break;
case GL_TEXTURE_PRIORITY:
*params = (GLint) obj->Priority;