Mesa (master): glx: Simplify __glxGetMscRate, it only needs the screen, not a drawable

[Ian Romanick]

Module: Mesa
Branch: master
Commit: fe2079c4c014934d1a5dbc87733742fea5a619da
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe2079c4c014934d1a5dbc87733742fea5a619da

Author: Lauri Kasanen <cand at gmx.com>
Date:   Sun Dec 15 12:37:55 2013 +0200

glx: Simplify __glxGetMscRate, it only needs the screen, not a drawable

Useful in its own right, but also needed for adaptive vsync.

No regressions in the piglit glx-oml-sync-control-getmscrate test.

Signed-off-by: Lauri Kasanen <cand at gmx.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Tested-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glx/dri_common.c |    2 +-
 src/glx/glxclient.h  |    2 +-
 src/glx/glxcmds.c    |    6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 22ba248..b5058c9 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -223,7 +223,7 @@ __driGetMSCRate(__DRIdrawable *draw,
 {
    __GLXDRIdrawable *glxDraw = loaderPrivate;
 
-   return __glxGetMscRate(glxDraw, numerator, denominator);
+   return __glxGetMscRate(glxDraw->psc, numerator, denominator);
 }
 
 _X_HIDDEN const __DRIsystemTimeExtension systemTimeExtension = {
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index e33dba6..a7118af 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -781,7 +781,7 @@ extern GLboolean __glXGetMscRateOML(Display * dpy, GLXDrawable drawable,
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
 extern GLboolean
-__glxGetMscRate(__GLXDRIdrawable *glxDraw,
+__glxGetMscRate(struct glx_screen *psc,
 		int32_t * numerator, int32_t * denominator);
 
 /* So that dri2.c:DRI2WireToEvent() can access
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 06c4c16..b5377c2 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -2095,16 +2095,14 @@ __glXGetSyncValuesOML(Display * dpy, GLXDrawable drawable,
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
 _X_HIDDEN GLboolean
-__glxGetMscRate(__GLXDRIdrawable *glxDraw,
+__glxGetMscRate(struct glx_screen *psc,
 		int32_t * numerator, int32_t * denominator)
 {
 #ifdef XF86VIDMODE
-   struct glx_screen *psc;
    XF86VidModeModeLine mode_line;
    int dot_clock;
    int i;
 
-   psc = glxDraw->psc;
    if (XF86VidModeQueryVersion(psc->dpy, &i, &i) &&
        XF86VidModeGetModeLine(psc->dpy, psc->scr, &dot_clock, &mode_line)) {
       unsigned n = dot_clock * 1000;
@@ -2180,7 +2178,7 @@ __glXGetMscRateOML(Display * dpy, GLXDrawable drawable,
    if (draw == NULL)
       return False;
 
-   return __glxGetMscRate(draw, numerator, denominator);
+   return __glxGetMscRate(draw->psc, numerator, denominator);
 #else
    (void) dpy;
    (void) drawable;