mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-08-02 03:35:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkan: remove unused X11 window system references

Browse source 
We use XCB instead
This commit is contained in:
Matthew Waters 2019-04-04 18:38:13 +11:00
parent 873add374a
commit eb0f7f3279
4 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/vulkan/gstvulkan.c
View file

@ -32,22 +32,13 @@
#include "vksink.h"
#include "vkupload.h"
#if GST_VULKAN_HAVE_WINDOW_X11
#include <X11/Xlib.h>
#endif
#define GST_CAT_DEFAULT gst_gl_gstgl_debug
#define GST_CAT_DEFAULT gst_vulkan_debug
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
static gboolean
plugin_init (GstPlugin * plugin)
{
GST_DEBUG_CATEGORY_INIT (gst_gl_gstgl_debug, "gstvulkan", 0, "gstvulkan");
#if GST_VULKAN_HAVE_WINDOW_X11
if (g_getenv ("GST_VULKAN_XINITTHREADS"))
XInitThreads ();
#endif
GST_DEBUG_CATEGORY_INIT (gst_vulkan_debug, "vulkan", 0, "vulkan");
if (!gst_element_register (plugin, "vulkansink",
GST_RANK_NONE, GST_TYPE_VULKAN_SINK)) {

3
ext/vulkan/vkdisplay.c
View file

@ -27,9 +27,6 @@
#include "vkdisplay.h"
#if GST_VULKAN_HAVE_WINDOW_X11
#include "x11/vkdisplay_x11.h"
#endif
#if GST_VULKAN_HAVE_WINDOW_XCB
#include "xcb/vkdisplay_xcb.h"
#endif

11
ext/vulkan/vkdisplay.h
View file

@ -44,13 +44,10 @@ GType gst_vulkan_display_get_type (void);
enum _GstVulkanDisplayType
{
GST_VULKAN_DISPLAY_TYPE_NONE = 0,
GST_VULKAN_DISPLAY_TYPE_X11 = (1 << 0),
GST_VULKAN_DISPLAY_TYPE_XCB = (1 << 1),
GST_VULKAN_DISPLAY_TYPE_WAYLAND = (1 << 2),
GST_VULKAN_DISPLAY_TYPE_MIR = (1 << 3),
GST_VULKAN_DISPLAY_TYPE_WIN32 = (1 << 4),
GST_VULKAN_DISPLAY_TYPE_COCOA = (1 << 5),
GST_VULKAN_DISPLAY_TYPE_IOS = (1 << 6),
GST_VULKAN_DISPLAY_TYPE_XCB = (1 << 0),
GST_VULKAN_DISPLAY_TYPE_WAYLAND = (1 << 1),
GST_VULKAN_DISPLAY_TYPE_COCOA = (1 << 2),
GST_VULKAN_DISPLAY_TYPE_IOS = (1 << 3),
GST_VULKAN_DISPLAY_TYPE_ANY = G_MAXUINT32
};

7
ext/vulkan/vkwindow.c
View file

@ -37,9 +37,6 @@
#include "vkwindow.h"
#if GST_VULKAN_HAVE_WINDOW_X11
#include "x11/vkwindow_x11.h"
#endif
#if GST_VULKAN_HAVE_WINDOW_XCB
#include "xcb/vkwindow_xcb.h"
#endif
@ -178,10 +175,6 @@ gst_vulkan_window_new (GstVulkanDisplay * display)
user_choice = g_getenv ("GST_VULKAN_WINDOW");
GST_INFO ("creating a window, user choice:%s", user_choice);
#if GST_VULKAN_HAVE_WINDOW_X11
if (!window && (!user_choice || g_strstr_len (user_choice, 3, "x11")))
window = GST_VULKAN_WINDOW (gst_vulkan_window_x11_new (display));
#endif
#if GST_VULKAN_HAVE_WINDOW_XCB
if (!window && (!user_choice || g_strstr_len (user_choice, 3, "xcb")))
window = GST_VULKAN_WINDOW (gst_vulkan_window_xcb_new (display));