summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-09-20 17:45:16 +0900
committerMichel Dänzer <michel@daenzer.net>2016-09-20 17:45:16 +0900
commit80cc892ee1ce54fad3cb7dd11bd9df18c359136f (patch)
tree6a4bf8ed311adc8e5a2b0ff18d9b77ff5e38a4d0
parent12d30eeb9711bd2b1609d6bbb74c4a1760596f72 (diff)
Use local implementation of RegionDuplicate for older xserver
It was only added in xserver 1.15. Fixes build against older xserver. Reported-by: Pali Rohár <pali.rohar@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--configure.ac6
-rw-r--r--src/radeon.h19
2 files changed, 25 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 394f45a8..8dc55d87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,6 +137,12 @@ else
fi
AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno)
+AC_CHECK_DECL(RegionDuplicate,
+ [AC_DEFINE(HAVE_REGIONDUPLICATE, 1,
+ [Have RegionDuplicate API])], [],
+ [#include <xorg-server.h>
+ #include <regionstr.h>])
+
AC_CHECK_DECL(fbGlyphs,
[AC_DEFINE(HAVE_FBGLYPHS, 1, [Have fbGlyphs API])], [],
[#include <X11/Xmd.h>
diff --git a/src/radeon.h b/src/radeon.h
index f3a3e1c8..590966fd 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -96,6 +96,25 @@
struct _SyncFence;
+#ifndef HAVE_REGIONDUPLICATE
+
+static inline RegionPtr
+RegionDuplicate(RegionPtr pOld)
+{
+ RegionPtr pNew;
+
+ pNew = RegionCreate(&pOld->extents, 0);
+ if (!pNew)
+ return NULL;
+ if (!RegionCopy(pNew, pOld)) {
+ RegionDestroy(pNew);
+ return NULL;
+ }
+ return pNew;
+}
+
+#endif
+
#ifndef MAX
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif