summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordawes <dawes>2001-06-08 18:23:41 +0000
committerdawes <dawes>2001-06-08 18:23:41 +0000
commitfa75268be48b8af92f699da86665fe72d3f29691 (patch)
tree9291ab583dcea5ced995fe9390bb99244680afb4
parent142e95fda894f8473dbf28514c4bb1c5bbedce5a (diff)
Comment out references to the unused grSetNumPendingBuffers function frommultihead-1-0-0-20010727-freeze
glide. This avoids a warning about it not being available when loading the voodoo3 version of libglide3.
-rw-r--r--xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c6
-rw-r--r--xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h3
2 files changed, 9 insertions, 0 deletions
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
index 4d418eccf..d5bba169b 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
@@ -521,6 +521,9 @@ GLboolean tdfxInitGlide(tdfxContextPtr tmesa)
return GL_FALSE;
}
+ if (env && strstr(env, "verbose")) {
+ fprintf(stderr, "libGL: trying Glide library %s\n", libName);
+ }
libHandle = dlopen(libName, 0);
if (!libHandle) {
/* The device-specific Glide library filename didn't work, try the
@@ -568,7 +571,10 @@ GLboolean tdfxInitGlide(tdfxContextPtr tmesa)
GET_FUNCTION(grFlush, "grFlush");
GET_FUNCTION(grSstWinOpen, "grSstWinOpen");
GET_FUNCTION(grSstWinClose, "grSstWinClose");
+#if 0
+ /* Not in V3 lib, and not used anyway. */
GET_FUNCTION(grSetNumPendingBuffers, "grSetNumPendingBuffers");
+#endif
GET_FUNCTION(grSelectContext, "grSelectContext");
GET_FUNCTION(grSstOrigin, "grSstOrigin");
GET_FUNCTION(grSstSelect, "grSstSelect");
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
index b61ed2108..07f7703b2 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
@@ -600,7 +600,10 @@ struct tdfx_glide {
int nColBuffers,
int nAuxBuffers);
void (*grSstWinClose)( GrContext_t context );
+/* Not used */
+#if 0
void (*grSetNumPendingBuffers)(FxI32 NumPendingBuffers);
+#endif
void (*grSelectContext)( GrContext_t context );
void (*grSstOrigin)(GrOriginLocation_t origin);
void (*grSstSelect)( int which_sst );