eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '7516bd349c' into main

Browse source
This commit is contained in:
Sam Lantinga 2023-01-12 16:21:52 -08:00
commit 4fc01c7a66
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/video/vivante/SDL_vivantevideo.h
View file

@ -18,11 +18,11 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "SDL_internal.h"
#ifndef SDL_vivantevideo_h_ #ifndef SDL_vivantevideo_h_
#define SDL_vivantevideo_h_ #define SDL_vivantevideo_h_
#include "SDL_internal.h"
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#include <SDL3/SDL_egl.h> #include <SDL3/SDL_egl.h>

3
src/video/vivante/SDL_vivantevulkan.c
View file

@ -18,6 +18,7 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "SDL_internal.h"
/* /*
* @author Wladimir J. van der Laan. Based on Jacob Lifshay's * @author Wladimir J. van der Laan. Based on Jacob Lifshay's
@ -25,8 +26,6 @@
* the FSL demo framework. * the FSL demo framework.
*/ */
#include "SDL_internal.h"
#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_VIVANTE #if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_VIVANTE
#include "SDL_vivantevideo.h" #include "SDL_vivantevideo.h"

3
src/video/vivante/SDL_vivantevulkan.h
View file

@ -18,14 +18,13 @@
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "SDL_internal.h"
/* /*
* @author Wladimir J. van der Laan. Based on Jacob Lifshay's * @author Wladimir J. van der Laan. Based on Jacob Lifshay's
* SDL_x11vulkan.h and Mark Callow's SDL_vivantevulkan.h * SDL_x11vulkan.h and Mark Callow's SDL_vivantevulkan.h
*/ */
#include "SDL_internal.h"
#ifndef SDL_vivantevulkan_h_ #ifndef SDL_vivantevulkan_h_
#define SDL_vivantevulkan_h_ #define SDL_vivantevulkan_h_