AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Rename GDK_WINDOWING_VULKAN

Browse Source 
The WINDOWING defines are only for GDK backends, really.
Define GDK_RENDERING_VULKAN instead.
This commit is contained in:
Matthias Clasen 2016-12-09 14:11:37 -05:00
parent 5b6a837b17
commit 3dd4f76703
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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

6
gdk/gdkdisplayprivate.h
View File

@ -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;

8
gdk/gdkvulkancontext.c
View File

@ -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 */

8
gdk/gdkvulkancontextprivate.h
View File

@ -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

2
gdk/x11/gdkdisplay-x11.c
View File

@ -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

4
gdk/x11/gdkvulkancontext-x11.c
View File

@ -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 */

4
gdk/x11/gdkvulkancontext-x11.h
View File

@ -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__ */