Skip to content

Commit

Permalink
switch: use new gfx (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cpasjuste @WinterMute
Cpasjuste authored and WinterMute committed Jun 18, 2021
1 parent 6748b87 commit 45b864b
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 88 deletions.
1 change: 0 additions & 1 deletion src/render/opengles2/SDL_render_gles2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,6 @@ GLES2_CacheProgram(GLES2_RenderData *data, GLES2_ShaderCacheEntry *vertex,
GLES2_ShaderCacheEntry *shaderEntry;
GLint linkSuccessful;

<<<<<<< HEAD
/* Check if we've already cached this program */
entry = data->program_cache.head;
while (entry) {
Expand Down
6 changes: 2 additions & 4 deletions src/video/switch/SDL_switchopengles.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@ SWITCH_GLES_LoadLibrary(_THIS, const char *path)
void
SWITCH_GLES_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h)
{
SDL_DisplayMode mode = {0, 0, 0, 0, 0};
SDL_GetCurrentDisplayMode(0, &mode);
*w = mode.w;
*h = mode.h;
*w = 1920;
*h = 1080;
}

SDL_EGL_CreateContext_impl(SWITCH)
Expand Down
149 changes: 82 additions & 67 deletions src/video/switch/SDL_switchvideo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

#if SDL_VIDEO_DRIVER_SWITCH

#include <switch.h>

#include "../SDL_sysvideo.h"
#include "../../render/SDL_sysrender.h"
#include "../../events/SDL_keyboard_c.h"
Expand Down Expand Up @@ -121,14 +119,14 @@ SWITCH_VideoInit(_THIS)
SDL_DisplayMode current_mode;
SDL_DisplayData *data;
SDL_DisplayModeData *mdata;
Result rc;

SDL_zero(current_mode);
current_mode.w = 1280;
current_mode.h = 720;
current_mode.w = 1920;
current_mode.h = 1080;
current_mode.refresh_rate = 60;
current_mode.format = SDL_PIXELFORMAT_RGBA8888;
mdata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
mdata->padding = 0;
current_mode.driverdata = mdata;

SDL_zero(display);
Expand All @@ -140,20 +138,38 @@ SWITCH_VideoInit(_THIS)
if (data == NULL) {
return SDL_OutOfMemory();
}

data->egl_display = EGL_DEFAULT_DISPLAY;
display.driverdata = data;

// init vi
rc = viInitialize(ViServiceType_Default);
if (R_FAILED(rc)) {
return SDL_SetError("Could not initialize vi service: 0x%x", rc);
}

rc = viOpenDefaultDisplay(&data->viDisplay);
if (R_FAILED(rc)) {
return SDL_SetError("Could not open default display: 0x%x", rc);
}

display.driverdata = data;
SDL_AddVideoDisplay(&display);

// init touch
SWITCH_InitTouch();

return 1;
return 0;
}

void
SWITCH_VideoQuit(_THIS)
{
SDL_DisplayData *data = SDL_GetDisplayDriverData(0);
if (data) {
viCloseDisplay(&data->viDisplay);
}
viExit();

// exit touch
SWITCH_QuitTouch();
}
Expand All @@ -164,72 +180,39 @@ SWITCH_GetDisplayModes(_THIS, SDL_VideoDisplay *display)
SDL_DisplayMode mode;
SDL_DisplayModeData *data;

// 1920x1080 (16/9) 16RGBA8888
if (appletGetOperationMode() == AppletOperationMode_Docked) {
SDL_zero(mode);
mode.w = 1920;
mode.h = 1080;
mode.refresh_rate = 60;
mode.format = SDL_PIXELFORMAT_RGBA8888;
data = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
data->padding = 0;
mode.driverdata = data;
SDL_AddDisplayMode(display, &mode);
}

// 1280x720 (16/9) RGBA8888
// 1920x1080 RGBA8888, default mode
SDL_AddDisplayMode(display, &display->current_mode);

// 960x540 (16/9) RGBA8888
// 1280x720 RGBA8888
SDL_zero(mode);
mode.w = 960;
mode.h = 540;
mode.w = 1280;
mode.h = 720;
mode.refresh_rate = 60;
mode.format = SDL_PIXELFORMAT_RGBA8888;
data = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
data->padding = 0;
mode.driverdata = data;
SDL_AddDisplayMode(display, &mode);

// 800x600 (4/3) RGBA8888
SDL_zero(mode);
mode.w = 800;
mode.h = 600;
mode.refresh_rate = 60;
mode.format = SDL_PIXELFORMAT_RGBA8888;
data = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
data->padding = (int) ((600.0f * 1.7774f) - 800.0f) / 2;
mode.driverdata = data;
SDL_AddDisplayMode(display, &mode);

// 640x480 (4/3) RGBA8888
SDL_zero(mode);
mode.w = 640;
mode.h = 480;
mode.refresh_rate = 60;
mode.format = SDL_PIXELFORMAT_RGBA8888;
data = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
data->padding = (int) ((480.0f * 1.7774f) - 640.0f) / 2;
mode.driverdata = data;
SDL_AddDisplayMode(display, &mode);
}

int
SWITCH_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode)
{
SDL_Renderer *renderer = SDL_GetRenderer(_this->windows);
SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode->driverdata;
SDL_WindowData *data;
Result rc;

if (!data) {
return -1;
if (display->fullscreen_window) {
data = (SDL_WindowData *) display->fullscreen_window->driverdata;
}
else {
if (!SDL_GetFocusWindow()) {
return SDL_SetError("Could not get window focus");
}
data = (SDL_WindowData *) SDL_GetFocusWindow()->driverdata;
}

gfxConfigureResolution(mode->w + data->padding * 2, mode->h);
display->current_mode = *mode;
_this->windows->w = mode->w;
_this->windows->h = mode->h;
if (renderer) {
renderer->UpdateViewport(renderer);
rc = nwindowSetCrop(&data->nWindow, 0, 0, mode->w, mode->h);
if (rc) {
return SDL_SetError("Could not set NWindow crop: 0x%x", rc);
}

return 0;
Expand All @@ -238,23 +221,52 @@ SWITCH_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode)
int
SWITCH_CreateWindow(_THIS, SDL_Window *window)
{
SDL_WindowData *wdata;
//SDL_VideoDisplay *display;

/* Allocate window internal data */
wdata = (SDL_WindowData *) SDL_calloc(1, sizeof(SDL_WindowData));
Result rc;
SDL_DisplayData *ddata = SDL_GetDisplayDriverData(0);
SDL_WindowData *wdata = (SDL_WindowData *) SDL_calloc(1, sizeof(SDL_WindowData));
if (wdata == NULL) {
return SDL_OutOfMemory();
}

window->flags |= SDL_WINDOW_FULLSCREEN;

if (!_this->egl_data) {
return SDL_SetError("SWITCH_CreateWindow: EGL not initialized");
return SDL_SetError("EGL not initialized");
}

rc = viCreateLayer(&ddata->viDisplay, &wdata->viLayer);
if (R_FAILED(rc)) {
return SDL_SetError("Could not create vi layer: 0x%x", rc);
}

rc = viSetLayerScalingMode(&wdata->viLayer, ViScalingMode_FitToLayer);
if (R_FAILED(rc)) {
viCloseLayer(&wdata->viLayer);
return SDL_SetError("Could not set vi scaling mode: 0x%x", rc);
}
wdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) &wdata->egl_surface);

rc = nwindowCreateFromLayer(&wdata->nWindow, &wdata->viLayer);
if (R_FAILED(rc)) {
viCloseLayer(&wdata->viLayer);
return SDL_SetError("Could not create NWindow from layer: 0x%x", rc);
}

rc = nwindowSetDimensions(&wdata->nWindow, 1920, 1080);
if (R_FAILED(rc)) {
nwindowClose(&wdata->nWindow);
viCloseLayer(&wdata->viLayer);
return SDL_SetError("Could not set NWindow dimensions: 0x%x", rc);
}

rc = nwindowSetCrop(&wdata->nWindow, 0, 0, window->w, window->h);
if (R_FAILED(rc)) {
nwindowClose(&wdata->nWindow);
viCloseLayer(&wdata->viLayer);
return SDL_SetError("Could not set NWindow crop: 0x%x", rc);
}

wdata->egl_surface = SDL_EGL_CreateSurface(_this, &wdata->nWindow);
if (wdata->egl_surface == EGL_NO_SURFACE) {
nwindowClose(&wdata->nWindow);
viCloseLayer(&wdata->viLayer);
return SDL_SetError("Could not create GLES window surface");
}

Expand All @@ -278,6 +290,8 @@ SWITCH_DestroyWindow(_THIS, SDL_Window *window)
if (data->egl_surface != EGL_NO_SURFACE) {
SDL_EGL_DestroySurface(_this, data->egl_surface);
}
nwindowClose(&data->nWindow);
viCloseLayer(&data->viLayer);
SDL_free(data);
window->driverdata = NULL;
}
Expand All @@ -303,6 +317,8 @@ SWITCH_SetWindowPosition(_THIS, SDL_Window *window)
void
SWITCH_SetWindowSize(_THIS, SDL_Window *window)
{
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
nwindowSetCrop(&data->nWindow, 0, 0, window->w, window->h);
}
void
SWITCH_ShowWindow(_THIS, SDL_Window *window)
Expand Down Expand Up @@ -331,7 +347,6 @@ SWITCH_RestoreWindow(_THIS, SDL_Window *window)
void
SWITCH_SetWindowGrab(_THIS, SDL_Window *window, SDL_bool grabbed)
{

}

void
Expand Down
6 changes: 5 additions & 1 deletion src/video/switch/SDL_switchvideo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,27 @@

#if SDL_VIDEO_DRIVER_SWITCH

#include <switch.h>

#include "../../SDL_internal.h"
#include "../SDL_sysvideo.h"

#include "SDL_egl.h"

typedef struct SDL_DisplayData
{
ViDisplay viDisplay;
EGLDisplay egl_display;
} SDL_DisplayData;

typedef struct SDL_DisplayModeData
{
int padding;
} SDL_DisplayModeData;

typedef struct SDL_WindowData
{
ViLayer viLayer;
NWindow nWindow;
EGLSurface egl_surface;
} SDL_WindowData;

Expand Down
47 changes: 32 additions & 15 deletions test/testswitch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,23 @@ int main(int argc, char *argv[])
SDL_Event event;
SDL_Window *window;
SDL_Renderer *renderer;
int done = 0, x = 0, w, h;
int done = 0, x = 0, w = 0, h = 0;

// mandatory at least on switch, else gfx is not properly closed
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
SDL_Log("SDL_Init: %s\n", SDL_GetError());
return -1;
}

// create a window (OpenGL always enabled)
// available switch SDL2 video modes :
// 1920 x 1080 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888) (docked only)
// 1280 x 720 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
// 960 x 540 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
// 800 x 600 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
// 640 x 480 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
window = SDL_CreateWindow("sdl2_gles2", 0, 0, 640, 480, SDL_WINDOW_FULLSCREEN);
/// create a window (OpenGL always enabled)
/// available switch SDL2 video modes :
/// 1920 x 1080 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
/// 1280 x 720 @ 32 bpp (SDL_PIXELFORMAT_RGBA8888)
///
/// SDL_SetWindowSize to change window size when SDL_WINDOW_FULLSCREEN is NOT used (preferably)
/// SDL_SetDisplayMode to change display size after SDL_CreateWindow called with SDL_WINDOW_FULLSCREEN
/// (this means window size won't change, you'll need to handle that, as any SDL2 app)
window = SDL_CreateWindow("sdl2_gles2", 0, 0, 1280, 720, 0);
if (!window) {
SDL_Log("SDL_CreateWindow: %s\n", SDL_GetError());
SDL_Quit();
Expand All @@ -109,6 +110,10 @@ int main(int argc, char *argv[])
SDL_DisplayMode mode;
SDL_GetDisplayMode(0, i, &mode);
modes[i] = mode;
SDL_Log("found display mode: %i x %i @ %i bpp (%s)",
mode.w, mode.h,
SDL_BITSPERPIXEL(mode.format),
SDL_GetPixelFormatName(mode.format));
}

// open CONTROLLER_PLAYER_1 and CONTROLLER_PLAYER_2
Expand Down Expand Up @@ -138,13 +143,25 @@ int main(int argc, char *argv[])
case SDL_JOYBUTTONDOWN:
SDL_Log("Joystick %d button %d down\n",
event.jbutton.which, event.jbutton.button);
// seek for joystick #0 down (A)
// https://github.com/devkitPro/SDL/blob/switch-sdl2/src/joystick/switch/SDL_sysjoystick.c#L52
if (event.jbutton.which == 0 && event.jbutton.button == 0) {
change_mode(window);
print_info(window, renderer);
if (event.jbutton.which == 0) {
if (event.jbutton.button == 0) {
// joystick #0 down (A)
change_mode(window);
print_info(window, renderer);
}
else if (event.jbutton.button == 2) {
// joystick #0 down (X)
if (w == 1920) {
SDL_SetWindowSize(window, 1280, 720);
}
else {
SDL_SetWindowSize(window, 1920, 1080);
}
print_info(window, renderer);
}
}
// seek for joystick #0 down (B)
// joystick #0 down (B)
if (event.jbutton.which == 0 && event.jbutton.button == 1) {
done = 1;
}
Expand All @@ -160,7 +177,7 @@ int main(int argc, char *argv[])

// Fill renderer bounds
SDL_SetRenderDrawColor(renderer, 111, 111, 111, 255);
SDL_GetRendererOutputSize(renderer, &w, &h);
SDL_GetWindowSize(window, &w, &h);
SDL_Rect f = {0, 0, w, h};
SDL_RenderFillRect(renderer, &f);

Expand Down

0 comments on commit 45b864b

Please sign in to comment.