From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 2 Jun 2005 04:07:08 +0000 (+0000)
Subject: oops, undo previous change
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=13c8f985d96fa7dda0fd71dc4f656ce01dcdbe85;p=mesa.git

oops, undo previous change
---

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index b633ae0dcef..0c07cc0c148 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -1648,8 +1648,7 @@ float
 driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, int64_t last_swap_ust,
 		       int64_t current_ust )
 {
-#if 0
-   static glXGetMscRateOML_t get_msc_rate = NULL;
+   static PFNGLXGETMSCRATEOMLPROC get_msc_rate = NULL;
    int32_t   n;
    int32_t   d;
    int       interval;
@@ -1657,7 +1656,7 @@ driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, int64_t last_swap_ust,
 
 
    if ( get_msc_rate == NULL ) {
-      get_msc_rate = (glXGetMscRateOML_t)
+      get_msc_rate = (PFNGLXGETMSCRATEOMLPROC)
 	  glXGetProcAddress( (const GLubyte *) "glXGetMscRateOML" );
    }
    
@@ -1686,9 +1685,6 @@ driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, int64_t last_swap_ust,
    }
    
    return usage;
-#else
-   return 0;
-#endif
 }
 
 /*@}*/
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index cb4e519d807..6ef1b114f9c 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -568,11 +568,9 @@ driCalculateSwapUsage( __DRIdrawablePrivate *dPriv,
 		       int64_t last_swap_ust, int64_t current_ust );
 
 /* Test for the GLX header glx.h */
-#if 0
 #ifndef GLX
 extern void 
 (*glXGetProcAddress(const GLubyte *procname))( void );
 #endif
-#endif
 
 #endif /* _DRI_UTIL_H_ */