Move GLX_MESA_swap_frame_usage DRI entry points to the new mechanism.

3 files changed, 30 insertions, 25 deletions

diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h
index b60d8a0b904..d9fc7a5a6c3 100644
--- a/src/glx/x11/glxclient.h
+++ b/src/glx/x11/glxclient.h
@@ -489,6 +489,10 @@ struct __GLXscreenConfigsRec {
     __DRIallocateExtension *allocate;
 #endif
 
+#ifdef __DRI_FRAME_TRACKING
+    __DRIframeTrackingExtension *frameTracking;
+#endif
+
 #endif
 
     /**
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index e2deca59686..2b0403d37c9 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -1835,15 +1835,13 @@ static int __glXGetSwapIntervalMESA(void)
 static GLint __glXBeginFrameTrackingMESA(Display *dpy, GLXDrawable drawable)
 {
    int   status = GLX_BAD_CONTEXT;
-#ifdef GLX_DIRECT_RENDERING
+#ifdef __DRI_FRAME_TRACKING
    int screen;
    __DRIdrawable * const pdraw = GetDRIDrawable(dpy, drawable, & screen);
    __GLXscreenConfigs * const psc = GetGLXScreenConfigs(dpy, screen);
 
-   if ( (pdraw != NULL) && (pdraw->frameTracking != NULL)
-	&& __glXExtensionBitIsEnabled( psc, MESA_swap_frame_usage_bit ) ) {
-      status = pdraw->frameTracking(pdraw, GL_TRUE);
-   }
+   if (pdraw != NULL && psc->frameTracking != NULL)
+       status = psc->frameTracking->frameTracking(pdraw, GL_TRUE);
 #else
    (void) dpy;
    (void) drawable;
@@ -1855,15 +1853,13 @@ static GLint __glXBeginFrameTrackingMESA(Display *dpy, GLXDrawable drawable)
 static GLint __glXEndFrameTrackingMESA(Display *dpy, GLXDrawable drawable)
 {
    int   status = GLX_BAD_CONTEXT;
-#ifdef GLX_DIRECT_RENDERING
+#ifdef __DRI_FRAME_TRACKING
    int screen;
    __DRIdrawable * const pdraw = GetDRIDrawable(dpy, drawable, & screen);
    __GLXscreenConfigs * const psc = GetGLXScreenConfigs(dpy, screen);
 
-   if ( (pdraw != NULL) && (pdraw->frameTracking != NULL)
-	&& __glXExtensionBitIsEnabled( psc, MESA_swap_frame_usage_bit ) ) {
-      status = pdraw->frameTracking(pdraw, GL_FALSE);
-   }
+   if (pdraw != NULL && psc->frameTracking != NULL)
+       status = psc->frameTracking->frameTracking(pdraw, GL_FALSE);
 #else
    (void) dpy;
    (void) drawable;
@@ -1876,18 +1872,19 @@ static GLint __glXGetFrameUsageMESA(Display *dpy, GLXDrawable drawable,
 				    GLfloat *usage)
 {
    int   status = GLX_BAD_CONTEXT;
-#ifdef GLX_DIRECT_RENDERING
+#ifdef __DRI_FRAME_TRACKING
    int screen;
    __DRIdrawable * const pdraw = GetDRIDrawable(dpy, drawable, & screen);
    __GLXscreenConfigs * const psc = GetGLXScreenConfigs(dpy, screen);
 
-   if ( (pdraw != NULL ) && (pdraw->queryFrameTracking != NULL)
-	&& __glXExtensionBitIsEnabled( psc, MESA_swap_frame_usage_bit ) ) {
-      int64_t sbc, missedFrames;
-      float   lastMissedUsage;
+   if (pdraw != NULL && psc->frameTracking != NULL) {
+       int64_t sbc, missedFrames;
+       float   lastMissedUsage;
 
-      status = pdraw->queryFrameTracking(pdraw, &sbc, &missedFrames,
-					 &lastMissedUsage, usage);
+       status = psc->frameTracking->queryFrameTracking(pdraw, &sbc,
+						       &missedFrames,
+						       &lastMissedUsage,
+						       usage);
    }
 #else
    (void) dpy;
@@ -1903,17 +1900,16 @@ static GLint __glXQueryFrameTrackingMESA(Display *dpy, GLXDrawable drawable,
 					 GLfloat *lastMissedUsage)
 {
    int   status = GLX_BAD_CONTEXT;
-#ifdef GLX_DIRECT_RENDERING
+#ifdef __DRI_FRAME_TRACKING
    int screen;
    __DRIdrawable * const pdraw = GetDRIDrawable(dpy, drawable, & screen);
    __GLXscreenConfigs * const psc = GetGLXScreenConfigs(dpy, screen);
 
-   if ( (pdraw != NULL ) && (pdraw->queryFrameTracking != NULL)
-	&& __glXExtensionBitIsEnabled( psc, MESA_swap_frame_usage_bit ) ) {
+   if (pdraw != NULL && psc->frameTracking != NULL) {
       float   usage;
 
-      status = pdraw->queryFrameTracking(pdraw, sbc, missedFrames,
-					 lastMissedUsage, &usage);
+      status = psc->frameTracking->queryFrameTracking(pdraw, sbc, missedFrames,
+						      lastMissedUsage, &usage);
    }
 #else
    (void) dpy;
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 8275b4b9e07..8a70e677342 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -1024,7 +1024,6 @@ static void queryExtensions(__GLXscreenConfigs *psc)
 	    psc->copySubBuffer = (__DRIcopySubBufferExtension *) extensions[i];
 	    __glXScrEnableExtension(&psc->driScreen,
 				    "GLX_MESA_copy_sub_buffer");
-	    
 	}
 #endif
 
@@ -1035,7 +1034,6 @@ static void queryExtensions(__GLXscreenConfigs *psc)
 				    "GLX_SGI_swap_control");
 	    __glXScrEnableExtension(&psc->driScreen,
 				    "GLX_MESA_swap_control");
-	    
 	}
 #endif
 
@@ -1046,7 +1044,14 @@ static void queryExtensions(__GLXscreenConfigs *psc)
 				    "GLX_SGI_swap_control");
 	    __glXScrEnableExtension(&psc->driScreen,
 				    "GLX_MESA_swap_control");
-	    
+	}
+#endif
+
+#ifdef __DRI_FRAME_TRACKING
+	if (strcmp(extensions[i]->name, __DRI_FRAME_TRACKING) == 0) {
+	    psc->frameTracking = (__DRIframeTrackingExtension *) extensions[i];
+	    __glXScrEnableExtension(&psc->driScreen,
+				    "GLX_MESA_swap_frame_usage");	    
 	}
 #endif