diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-06-02 04:07:08 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-06-02 04:07:08 +0000 |
| commit | 13c8f985d96fa7dda0fd71dc4f656ce01dcdbe85 (patch) | |
| tree | 563b91d03c4650d18a3555ce772d1965fc031f60 /src | |
| parent | 1516f559bc1d8af1ca3a12c78b23937e9208b5c6 (diff) | |
oops, undo previous change
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.h | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index b633ae0dce..0c07cc0c14 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 cb4e519d80..6ef1b114f9 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_ */ |