summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2017-03-06 18:09:58 +0900
committerMichel Dänzer <michel@daenzer.net>2017-03-07 16:56:24 +0900
commit8d2b7d1758e3fcac520a18a0684c073f0ac62389 (patch)
treeff613feb27363b9efe2db62a6beb5f37735c501d
parentcd73100114a18642d9c40f1df33cef8311e96a8b (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> (Ported from radeon commit 80cc892ee1ce54fad3cb7dd11bd9df18c359136f) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--configure.ac6
-rw-r--r--src/amdgpu_drv.h19
2 files changed, 25 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 11dc285..00249a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,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/amdgpu_drv.h b/src/amdgpu_drv.h
index ae5b6f9..0700dae 100644
--- a/src/amdgpu_drv.h
+++ b/src/amdgpu_drv.h
@@ -89,6 +89,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