Merge commit '852f2a6343518919e5ca8d3c1bbcab9f493e3cd8'
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
@@ -23,5 +23,7 @@
|
||||
|
||||
extern void PSP_InitOSKeymap(SDL_VideoDevice *_this);
|
||||
extern void PSP_PumpEvents(SDL_VideoDevice *_this);
|
||||
extern int PSP_EventInit(SDL_VideoDevice *_this);
|
||||
extern void PSP_EventQuit(SDL_VideoDevice *_this);
|
||||
|
||||
/* end of SDL_pspevents_c.h ... */
|
||||
|
2
external/sdl/SDL/src/video/psp/SDL_pspgl.c
vendored
2
external/sdl/SDL/src/video/psp/SDL_pspgl.c
vendored
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
|
2
external/sdl/SDL/src/video/psp/SDL_pspgl_c.h
vendored
2
external/sdl/SDL/src/video/psp/SDL_pspgl_c.h
vendored
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
|
30
external/sdl/SDL/src/video/psp/SDL_pspvideo.c
vendored
30
external/sdl/SDL/src/video/psp/SDL_pspvideo.c
vendored
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
@@ -28,8 +28,6 @@
|
||||
#include "../../events/SDL_mouse_c.h"
|
||||
#include "../../events/SDL_keyboard_c.h"
|
||||
|
||||
#include <SDL3/SDL_syswm.h>
|
||||
|
||||
/* PSP declarations */
|
||||
#include "SDL_pspvideo.h"
|
||||
#include "SDL_pspevents_c.h"
|
||||
@@ -53,22 +51,19 @@ static SDL_VideoDevice *PSP_Create()
|
||||
|
||||
/* Initialize SDL_VideoDevice structure */
|
||||
device = (SDL_VideoDevice *)SDL_calloc(1, sizeof(SDL_VideoDevice));
|
||||
if (device == NULL) {
|
||||
SDL_OutOfMemory();
|
||||
if (!device) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Initialize internal PSP specific data */
|
||||
phdata = (SDL_VideoData *)SDL_calloc(1, sizeof(SDL_VideoData));
|
||||
if (phdata == NULL) {
|
||||
SDL_OutOfMemory();
|
||||
if (!phdata) {
|
||||
SDL_free(device);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gldata = (SDL_GLDriverData *)SDL_calloc(1, sizeof(SDL_GLDriverData));
|
||||
if (gldata == NULL) {
|
||||
SDL_OutOfMemory();
|
||||
if (!gldata) {
|
||||
SDL_free(device);
|
||||
SDL_free(phdata);
|
||||
return NULL;
|
||||
@@ -91,7 +86,6 @@ static SDL_VideoDevice *PSP_Create()
|
||||
device->GetDisplayModes = PSP_GetDisplayModes;
|
||||
device->SetDisplayMode = PSP_SetDisplayMode;
|
||||
device->CreateSDLWindow = PSP_CreateWindow;
|
||||
device->CreateSDLWindowFrom = PSP_CreateWindowFrom;
|
||||
device->SetWindowTitle = PSP_SetWindowTitle;
|
||||
device->SetWindowPosition = PSP_SetWindowPosition;
|
||||
device->SetWindowSize = PSP_SetWindowSize;
|
||||
@@ -134,6 +128,10 @@ int PSP_VideoInit(SDL_VideoDevice *_this)
|
||||
{
|
||||
SDL_DisplayMode mode;
|
||||
|
||||
if (PSP_EventInit(_this) == -1) {
|
||||
return -1; /* error string would already be set */
|
||||
}
|
||||
|
||||
SDL_zero(mode);
|
||||
mode.w = 480;
|
||||
mode.h = 272;
|
||||
@@ -150,6 +148,7 @@ int PSP_VideoInit(SDL_VideoDevice *_this)
|
||||
|
||||
void PSP_VideoQuit(SDL_VideoDevice *_this)
|
||||
{
|
||||
PSP_EventQuit(_this);
|
||||
}
|
||||
|
||||
int PSP_GetDisplayModes(SDL_VideoDevice *_this, SDL_VideoDisplay *display)
|
||||
@@ -188,14 +187,14 @@ int PSP_SetDisplayMode(SDL_VideoDevice *_this, SDL_VideoDisplay *display, SDL_Di
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
int PSP_CreateWindow(SDL_VideoDevice *_this, SDL_Window *window)
|
||||
int PSP_CreateWindow(SDL_VideoDevice *_this, SDL_Window *window, SDL_PropertiesID create_props)
|
||||
{
|
||||
SDL_WindowData *wdata;
|
||||
|
||||
/* Allocate window internal data */
|
||||
wdata = (SDL_WindowData *)SDL_calloc(1, sizeof(SDL_WindowData));
|
||||
if (wdata == NULL) {
|
||||
return SDL_OutOfMemory();
|
||||
if (!wdata) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Setup driver data for this window */
|
||||
@@ -207,11 +206,6 @@ int PSP_CreateWindow(SDL_VideoDevice *_this, SDL_Window *window)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int PSP_CreateWindowFrom(SDL_VideoDevice *_this, SDL_Window *window, const void *data)
|
||||
{
|
||||
return SDL_Unsupported();
|
||||
}
|
||||
|
||||
void PSP_SetWindowTitle(SDL_VideoDevice *_this, SDL_Window *window)
|
||||
{
|
||||
}
|
||||
|
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
@@ -49,8 +49,7 @@ int PSP_VideoInit(SDL_VideoDevice *_this);
|
||||
void PSP_VideoQuit(SDL_VideoDevice *_this);
|
||||
int PSP_GetDisplayModes(SDL_VideoDevice *_this, SDL_VideoDisplay *display);
|
||||
int PSP_SetDisplayMode(SDL_VideoDevice *_this, SDL_VideoDisplay *display, SDL_DisplayMode *mode);
|
||||
int PSP_CreateWindow(SDL_VideoDevice *_this, SDL_Window *window);
|
||||
int PSP_CreateWindowFrom(SDL_VideoDevice *_this, SDL_Window *window, const void *data);
|
||||
int PSP_CreateWindow(SDL_VideoDevice *_this, SDL_Window *window, SDL_PropertiesID create_props);
|
||||
void PSP_SetWindowTitle(SDL_VideoDevice *_this, SDL_Window *window);
|
||||
int PSP_SetWindowPosition(SDL_VideoDevice *_this, SDL_Window *window);
|
||||
void PSP_SetWindowSize(SDL_VideoDevice *_this, SDL_Window *window);
|
||||
|
Reference in New Issue
Block a user