From dec7875a6e23212021e4d9080330a42832dfe02a Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 15 Jun 2021 01:40:19 +0000
Subject: [PATCH] update SDL soruce to 2.0.14
---
source/src/video/directfb/SDL_DirectFB_video.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/source/src/video/directfb/SDL_DirectFB_video.c b/source/src/video/directfb/SDL_DirectFB_video.c
index a1e5a8b..5ea61a1 100644
--- a/source/src/video/directfb/SDL_DirectFB_video.c
+++ b/source/src/video/directfb/SDL_DirectFB_video.c
@@ -27,6 +27,7 @@
*/
#include "SDL_DirectFB_modes.h"
#include "SDL_DirectFB_opengl.h"
+#include "SDL_DirectFB_vulkan.h"
#include "SDL_DirectFB_window.h"
#include "SDL_DirectFB_WM.h"
@@ -60,12 +61,11 @@
static int DirectFB_VideoInit(_THIS);
static void DirectFB_VideoQuit(_THIS);
-static int DirectFB_Available(void);
static SDL_VideoDevice *DirectFB_CreateDevice(int devindex);
VideoBootStrap DirectFB_bootstrap = {
"directfb", "DirectFB",
- DirectFB_Available, DirectFB_CreateDevice
+ DirectFB_CreateDevice
};
static const DirectFBSurfaceDrawingFlagsNames(drawing_flags);
@@ -73,15 +73,6 @@
static const DirectFBAccelerationMaskNames(acceleration_mask);
/* DirectFB driver bootstrap functions */
-
-static int
-DirectFB_Available(void)
-{
- if (!SDL_DirectFB_LoadLibrary())
- return 0;
- SDL_DirectFB_UnLoadLibrary();
- return 1;
-}
static void
DirectFB_DeleteDevice(SDL_VideoDevice * device)
@@ -145,6 +136,13 @@
device->shape_driver.CreateShaper = DirectFB_CreateShaper;
device->shape_driver.SetWindowShape = DirectFB_SetWindowShape;
device->shape_driver.ResizeWindowShape = DirectFB_ResizeWindowShape;
+
+#if SDL_VIDEO_VULKAN
+ device->Vulkan_LoadLibrary = DirectFB_Vulkan_LoadLibrary;
+ device->Vulkan_UnloadLibrary = DirectFB_Vulkan_UnloadLibrary;
+ device->Vulkan_GetInstanceExtensions = DirectFB_Vulkan_GetInstanceExtensions;
+ device->Vulkan_CreateSurface = DirectFB_Vulkan_CreateSurface;
+#endif
device->free = DirectFB_DeleteDevice;
@@ -324,7 +322,9 @@
{ DSPF_YUY2, SDL_PIXELFORMAT_YUY2 }, /* 16 bit YUV (4 byte/ 2 pixel, macropixel contains CbYCrY [31:0]) */
{ DSPF_UYVY, SDL_PIXELFORMAT_UYVY }, /* 16 bit YUV (4 byte/ 2 pixel, macropixel contains YCbYCr [31:0]) */
{ DSPF_RGB555, SDL_PIXELFORMAT_RGB555 }, /* 16 bit RGB (2 byte, nothing @15, red 5@10, green 5@5, blue 5@0) */
+#if (DFB_VERSION_ATLEAST(1,5,0))
{ DSPF_ABGR, SDL_PIXELFORMAT_ABGR8888 }, /* 32 bit ABGR (4 byte, alpha 8@24, blue 8@16, green 8@8, red 8@0) */
+#endif
#if (ENABLE_LUT8)
{ DSPF_LUT8, SDL_PIXELFORMAT_INDEX8 }, /* 8 bit LUT (8 bit color and alpha lookup from palette) */
#endif
--
Gitblit v1.9.3