Merge pull request #222 from zeux/namespace

Add VOLK_NAMESPACE configuration to use C++ namespaces

Author: zeux

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5...3.30)
 
-project(volk VERSION 
+project(volk VERSION
 # VOLK_GENERATE_VERSION
 326
 # VOLK_GENERATE_VERSION
@@ -18,6 +18,9 @@ endif()
 if(NOT DEFINED VOLK_INSTALL)
   option(VOLK_INSTALL "Create installation targets" OFF)
 endif()
+if(NOT DEFINED VOLK_NAMESPACE)
+  option(VOLK_NAMESPACE "Use C++ namespace for vk* functions" OFF)
+endif()
 if(NOT DEFINED VOLK_HEADERS_ONLY)
   option(VOLK_HEADERS_ONLY "Add interface library only" OFF)
 endif()
@@ -35,6 +38,10 @@ if(NOT VOLK_HEADERS_ONLY OR VOLK_INSTALL)
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
     $<INSTALL_INTERFACE:include>
   )
+  if(VOLK_NAMESPACE)
+    target_compile_definitions(volk PUBLIC VOLK_NAMESPACE)
+    set_source_files_properties(volk.c PROPERTIES LANGUAGE CXX)
+  endif()
   if(VOLK_STATIC_DEFINES)
     target_compile_definitions(volk PUBLIC ${VOLK_STATIC_DEFINES})
   endif()

volk.c

@@ -24,8 +24,12 @@
 #include <string.h>
 
 #ifdef __cplusplus
+#ifdef VOLK_NAMESPACE
+namespace volk {
+#else
 extern "C" {
 #endif
+#endif
 
 #ifdef _WIN32
 __declspec(dllimport) HMODULE __stdcall LoadLibraryA(LPCSTR);
@@ -3572,6 +3576,6 @@ PFN_vkAcquireNextImage2KHR vkAcquireNextImage2KHR;
 #endif
 
 #ifdef __cplusplus
-}
+} // extern "C" / namespace volk
 #endif
 /* clang-format on */

volk.h

@@ -10,6 +10,10 @@
 #ifndef VOLK_H_
 #define VOLK_H_
 
+#if defined(VOLK_NAMESPACE) && !defined(__cplusplus)
+#error VOLK_NAMESPACE is only supported in C++
+#endif
+
 #if defined(VULKAN_H_) && !defined(VK_NO_PROTOTYPES)
 #	error To use volk, you need to define VK_NO_PROTOTYPES before including vulkan.h
 #endif
@@ -32,8 +36,12 @@
 #endif
 
 #ifdef __cplusplus
+#ifdef VOLK_NAMESPACE
+namespace volk {
+#else
 extern "C" {
 #endif
+#endif
 
 struct VolkDeviceTable;
 
@@ -105,7 +113,7 @@ VkDevice volkGetLoadedDevice(void);
 void volkLoadDeviceTable(struct VolkDeviceTable* table, VkDevice device);
 
 #ifdef __cplusplus
-}
+} // extern "C" / namespace volk
 #endif
 
 /* Instead of directly including vulkan.h, we include platform-specific parts of the SDK manually
@@ -1515,8 +1523,12 @@ struct VolkDeviceTable
 };
 
 #ifdef __cplusplus
+#ifdef VOLK_NAMESPACE
+namespace volk {
+#else
 extern "C" {
 #endif
+#endif
 
 /* VOLK_GENERATE_PROTOTYPES_H */
 #if defined(VK_VERSION_1_0)
@@ -2726,11 +2738,15 @@ extern PFN_vkAcquireNextImage2KHR vkAcquireNextImage2KHR;
 #endif
 
 #ifdef __cplusplus
-}
+} // extern "C" / namespace volk
 #endif
 
+#ifdef VOLK_NAMESPACE
+using namespace volk;
 #endif
 
+#endif // VOLK_H
+
 #ifdef VOLK_IMPLEMENTATION
 #undef VOLK_IMPLEMENTATION
 /* Prevent tools like dependency checkers from detecting a cyclic dependency */