[gtk+] Rename GDK_WINDOWING_VULKAN



commit 3dd4f767036a5b5b6a41959d15539beedb7a12d1
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 9 14:11:37 2016 -0500

    Rename GDK_WINDOWING_VULKAN
    
    The WINDOWING defines are only for GDK backends, really.
    Define GDK_RENDERING_VULKAN instead.

 configure.ac                   |    2 +-
 gdk/gdkdisplayprivate.h        |    6 +++---
 gdk/gdkvulkancontext.c         |    8 ++++----
 gdk/gdkvulkancontextprivate.h  |    8 ++++----
 gdk/x11/gdkdisplay-x11.c       |    2 +-
 gdk/x11/gdkvulkancontext-x11.c |    4 ++--
 gdk/x11/gdkvulkancontext-x11.h |    4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d2c7158..b0d3767 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1335,7 +1335,7 @@ if test "x$enable_vulkan" != "xno"; then
       else
           GDK_EXTRA_LIBS="-lvulkan"
           GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_VULKAN"
+#define GDK_RENDERING_VULKAN"
           AC_PATH_PROG([GLSLC], [glslc])
           vulkan_result="yes"
       fi
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 8aba6d1..156b869 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -24,7 +24,7 @@
 #include "gdkmonitor.h"
 #include "gdkinternals.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>
 #endif
 
@@ -124,7 +124,7 @@ struct _GdkDisplay
   guint double_click_time;  /* Maximum time between clicks in msecs */
   guint double_click_distance;   /* Maximum distance between clicks in pixels */
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
   VkInstance vk_instance;
   VkDebugReportCallbackEXT vk_debug_callback;
   VkPhysicalDevice vk_physical_device;
@@ -133,7 +133,7 @@ struct _GdkDisplay
   uint32_t vk_queue_family_index;
 
   guint vulkan_refcount;
-#endif /* GDK_WINDOWING_VULKAN */
+#endif /* GDK_RENDERING_VULKAN */
   guint rgba : 1;
   guint composited : 1;
 
diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c
index c5763c4..693b36c 100644
--- a/gdk/gdkvulkancontext.c
+++ b/gdk/gdkvulkancontext.c
@@ -22,7 +22,7 @@
 
 #include "gdkvulkancontextprivate.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>
 #endif
 
@@ -62,7 +62,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GdkVulkanContext, gdk_vulkan_context, GDK_TYPE
                                   G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gdk_vulkan_context_initable_init)
                                   G_ADD_PRIVATE (GdkVulkanContext))
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 
 const char *
 gdk_vulkan_strerror (VkResult result)
@@ -836,7 +836,7 @@ gdk_display_unref_vulkan (GdkDisplay *display)
   display->vk_instance = VK_NULL_HANDLE;
 }
 
-#else /* GDK_WINDOWING_VULKAN */
+#else /* GDK_RENDERING_VULKAN */
 
 static void
 gdk_vulkan_context_class_init (GdkVulkanContextClass *klass)
@@ -861,4 +861,4 @@ gdk_vulkan_context_initable_init (GInitableIface *iface)
 {
 }
 
-#endif /* GDK_WINDOWING_VULKAN */
+#endif /* GDK_RENDERING_VULKAN */
diff --git a/gdk/gdkvulkancontextprivate.h b/gdk/gdkvulkancontextprivate.h
index 42fdbac..6142c04 100644
--- a/gdk/gdkvulkancontextprivate.h
+++ b/gdk/gdkvulkancontextprivate.h
@@ -26,7 +26,7 @@
 #include "gdkdrawcontextprivate.h"
 #include "gdkinternals.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>
 #endif
 
@@ -51,7 +51,7 @@ struct _GdkVulkanContextClass
                                          VkSurfaceKHR           *surface);
 };
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 
 static inline VkResult
 gdk_vulkan_handle_result (VkResult    res,
@@ -70,7 +70,7 @@ gboolean        gdk_display_ref_vulkan                          (GdkDisplay
                                                                  GError         **error);
 void            gdk_display_unref_vulkan                        (GdkDisplay      *display);
 
-#else /* !GDK_WINDOWING_VULKAN */
+#else /* !GDK_RENDERING_VULKAN */
 
 static inline gboolean
 gdk_display_ref_vulkan (GdkDisplay  *display,
@@ -84,7 +84,7 @@ gdk_display_ref_vulkan (GdkDisplay  *display,
   return FALSE;
 }
 
-#endif /* !GDK_WINDOWING_VULKAN */
+#endif /* !GDK_RENDERING_VULKAN */
 
 G_END_DECLS
 
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 9efe829..547a9ae 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2954,7 +2954,7 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   object_class->finalize = gdk_x11_display_finalize;
 
   display_class->window_type = GDK_TYPE_X11_WINDOW;
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
   display_class->vk_context_type = GDK_TYPE_X11_VULKAN_CONTEXT;
   display_class->vk_extension_name = VK_KHR_XLIB_SURFACE_EXTENSION_NAME;
 #endif
diff --git a/gdk/x11/gdkvulkancontext-x11.c b/gdk/x11/gdkvulkancontext-x11.c
index 0d1038f..608a2e2 100644
--- a/gdk/x11/gdkvulkancontext-x11.c
+++ b/gdk/x11/gdkvulkancontext-x11.c
@@ -22,7 +22,7 @@
 
 #include "gdkconfig.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 
 #include "gdkvulkancontext-x11.h"
 
@@ -71,5 +71,5 @@ gdk_x11_vulkan_context_init (GdkX11VulkanContext *self)
 {
 }
 
-#endif /* GDK_WINDOWING_VULKAN */
+#endif /* GDK_RENDERING_VULKAN */
 
diff --git a/gdk/x11/gdkvulkancontext-x11.h b/gdk/x11/gdkvulkancontext-x11.h
index 8c3dab1..f275c00 100644
--- a/gdk/x11/gdkvulkancontext-x11.h
+++ b/gdk/x11/gdkvulkancontext-x11.h
@@ -23,7 +23,7 @@
 
 #include "gdkconfig.h"
 
-#ifdef GDK_WINDOWING_VULKAN
+#ifdef GDK_RENDERING_VULKAN
 
 #define VK_USE_PLATFORM_XLIB_KHR
 
@@ -56,6 +56,6 @@ GType gdk_x11_vulkan_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* !GDK_WINDOWING_VULKAN */
+#endif /* !GDK_RENDERING_VULKAN */
 
 #endif /* __GDK_X11_VULKAN_CONTEXT__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]