From 8d2b7d1758e3fcac520a18a0684c073f0ac62389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Mon, 6 Mar 2017 18:09:58 +0900 Subject: [PATCH] Use local implementation of RegionDuplicate for older xserver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was only added in xserver 1.15. Fixes build against older xserver. Reported-by: Pali Rohár (Ported from radeon commit 80cc892ee1ce54fad3cb7dd11bd9df18c359136f) Reviewed-by: Alex Deucher --- configure.ac | 6 ++++++ src/amdgpu_drv.h | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) 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 + #include ]) + AC_CHECK_DECL(fbGlyphs, [AC_DEFINE(HAVE_FBGLYPHS, 1, [Have fbGlyphs API])], [], [#include 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