From db41f92040971843cac967de9223866b39397785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
Date: Wed, 21 Sep 2016 12:57:24 +0200
Subject: [PATCH] libs/vkd3d: Add vkd3d_common.h.

---
 configure.ac               | 20 ++++++++++++++++
 libs/vkd3d/vkd3d_common.h  | 49 ++++++++++++++++++++++++++++++++++++++
 libs/vkd3d/vkd3d_private.h |  3 ++-
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 libs/vkd3d/vkd3d_common.h

diff --git a/configure.ac b/configure.ac
index 043eb6cd..e9285663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,26 @@ then
     VKD3D_CHECK_CFLAGS([-Wvla])
 fi
 
+dnl Check for __sync_add_and_fetch
+AC_MSG_CHECKING([for __sync_add_and_fetch])
+AC_LINK_IFELSE(
+    [AC_LANG_SOURCE([
+        int main(void) { return __sync_add_and_fetch((int *)0, 0); }
+    ])],
+    [AC_MSG_RESULT([yes])
+    AC_DEFINE([HAVE_SYNC_ADD_AND_FETCH], [1], [Define to 1 if you have __sync_add_and_fetch.])],
+    [AC_MSG_RESULT([no])])
+
+dnl Check for __sync_sub_and_fetch
+AC_MSG_CHECKING([for __sync_sub_and_fetch])
+AC_LINK_IFELSE(
+    [AC_LANG_SOURCE([
+        int main(void) { return __sync_sub_and_fetch((int *)0, 0); }
+    ])],
+    [AC_MSG_RESULT([yes])
+    AC_DEFINE([HAVE_SYNC_SUB_AND_FETCH], [1], [Define to 1 if you have __sync_sub_and_fetch.])],
+    [AC_MSG_RESULT([no])])
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
diff --git a/libs/vkd3d/vkd3d_common.h b/libs/vkd3d/vkd3d_common.h
new file mode 100644
index 00000000..54924177
--- /dev/null
+++ b/libs/vkd3d/vkd3d_common.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2016 Józef Kucia for CodeWeavers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __VKD3D_COMMON_H
+#define __VKD3D_COMMON_H
+
+#include "config.h"
+#include "vkd3d_windows.h"
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+
+#if HAVE_SYNC_ADD_AND_FETCH
+static inline ULONG InterlockedIncrement(ULONG volatile *x)
+{
+    return __sync_add_and_fetch(x, 1);
+}
+#else
+# error "InterlockedIncrement not implemented for this platform"
+#endif  /* HAVE_SYNC_ADD_AND_FETCH */
+
+#if HAVE_SYNC_SUB_AND_FETCH
+static inline ULONG InterlockedDecrement(ULONG volatile *x)
+{
+    return __sync_sub_and_fetch(x, 1);
+}
+#else
+# error "InterlockedDecrement not implemented for this platform"
+#endif
+
+#endif  /* __VKD3D_COMMON_H */
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 20715363..a605918f 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -23,7 +23,8 @@
 #ifndef __VKD3D_PRIVATE_H
 #define __VKD3D_PRIVATE_H
 
-#include "vkd3d_windows.h"
+#include "vkd3d_common.h"
+
 #include "d3d12.h"
 
 #include <assert.h>