xserver: Branch 'master'

[Eric Anholt]

 glx/glxdri2.c      |    1 -
 glx/glxdricommon.c |   23 -----------------------
 glx/glxdricommon.h |    2 --
 glx/glxdriswrast.c |    1 -
 4 files changed, 27 deletions(-)

New commits:
commit da29a15874229d78ec61946eacdbbed9871e3664
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Sep 29 18:36:43 2016 +0100

    glx: remove unused systemTimeExtension
    
    Not even a single DRI2/DRISW driver in mesa ever used this. Appears to be a
    dri1 artefact copy/pasted in the dri2/drisw codebase.
    
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 9961c1bfb..8516368ac 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -767,7 +767,6 @@ static const __DRIuseInvalidateExtension dri2UseInvalidate = {
 };
 
 static const __DRIextension *loader_extensions[] = {
-    &systemTimeExtension.base,
     &loaderExtension.base,
     &dri2UseInvalidate.base,
     NULL
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index f6c6fcdf2..c35dc1d1e 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -41,29 +41,6 @@
 #include "glxscreens.h"
 #include "glxdricommon.h"
 
-static int
-getUST(int64_t * ust)
-{
-    struct timeval tv;
-
-    if (ust == NULL)
-        return -EFAULT;
-
-    if (gettimeofday(&tv, NULL) == 0) {
-        ust[0] = (tv.tv_sec * 1000000) + tv.tv_usec;
-        return 0;
-    }
-    else {
-        return -errno;
-    }
-}
-
-const __DRIsystemTimeExtension systemTimeExtension = {
-    {__DRI_SYSTEM_TIME, 1},
-    getUST,
-    NULL,
-};
-
 #define __ATTRIB(attrib, field) \
     { attrib, offsetof(__GLXconfig, field) }
 
diff --git a/glx/glxdricommon.h b/glx/glxdricommon.h
index 2db46dc07..6851f244e 100644
--- a/glx/glxdricommon.h
+++ b/glx/glxdricommon.h
@@ -35,8 +35,6 @@ struct __GLXDRIconfig {
 __GLXconfig *glxConvertConfigs(const __DRIcoreExtension * core,
                                const __DRIconfig ** configs);
 
-extern const __DRIsystemTimeExtension systemTimeExtension;
-
 void *glxProbeDriver(const char *name,
                      void **coreExt, const char *coreName, int coreVersion,
                      void **renderExt, const char *renderName,
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 251bdd2dd..97068546e 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -337,7 +337,6 @@ static const __DRIswrastLoaderExtension swrastLoaderExtension = {
 };
 
 static const __DRIextension *loader_extensions[] = {
-    &systemTimeExtension.base,
     &swrastLoaderExtension.base,
     NULL
 };