Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-04-25 15:58:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

wiiu: Linking fixes

Browse Source
This commit is contained in:
rw-r-r-0644 2018-10-25 17:16:23 +02:00 committed by Ash Logan
parent 888d0c5dca
commit 3798398c51
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.wiiu
View File

@ -23,6 +23,7 @@ SOURCES = \
src/filesystem/dummy/*.c \
src/render/*.c \
src/render/wiiu/*.c \
src/render/software/*.c \
src/stdlib/*.c \
src/thread/*.c \
src/thread/wiiu/*.c \

11
src/render/SDL_render.c
View File

@ -97,6 +97,9 @@ static const SDL_RenderDriver *render_drivers[] = {
#endif
#if SDL_VIDEO_RENDER_PSP
&PSP_RenderDriver,
#endif
#if SDL_VIDEO_RENDER_WIIU
&WIIU_RenderDriver,
#endif
&SW_RenderDriver
};
@ -198,7 +201,7 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
}
} else if (event->window.event == SDL_WINDOWEVENT_MINIMIZED) {
renderer->hidden = SDL_TRUE;
} else if (event->window.event == SDL_WINDOWEVENT_RESTORED ||
} else if (event->window.event == SDL_WINDOWEVENT_RESTORED ||
event->window.event == SDL_WINDOWEVENT_MAXIMIZED) {
if (!(SDL_GetWindowFlags(window) & SDL_WINDOW_HIDDEN)) {
renderer->hidden = SDL_FALSE;
@ -1350,9 +1353,9 @@ UpdateLogicalSize(SDL_Renderer *renderer)
SDL_RenderSetViewport(renderer, NULL);
} else if (want_aspect > real_aspect) {
if (scale_policy == 1) {
/* We want a wider aspect ratio than is available -
zoom so logical height matches the real height
and the width will grow off the screen
/* We want a wider aspect ratio than is available -
zoom so logical height matches the real height
and the width will grow off the screen
*/
scale = (float)h / renderer->logical_h;
viewport.y = 0;

1
src/render/SDL_sysrender.h
View File

@ -200,6 +200,7 @@ extern SDL_RenderDriver DirectFB_RenderDriver;
extern SDL_RenderDriver METAL_RenderDriver;
extern SDL_RenderDriver PSP_RenderDriver;
extern SDL_RenderDriver SW_RenderDriver;
extern SDL_RenderDriver WIIU_RenderDriver;
/* Blend mode functions */
extern SDL_BlendFactor SDL_GetBlendModeSrcColorFactor(SDL_BlendMode blendMode);

6
src/video/wiiu/wiiu_shaders.c
View File

@ -1,3 +1,5 @@
#include <whb/gfx.h>
/*
=======================================
@ -50,6 +52,8 @@ END_OF_PROGRAM
*/
WHBGfxShaderGroup wiiuTextureShader;
int wiiuTextureShaderInit = 0;
unsigned char wiiuTextureShaderData[] = {
0x47, 0x66, 0x78, 0x32, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x07,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
@ -224,6 +228,8 @@ END_OF_PROGRAM
*/
WHBGfxShaderGroup wiiuColorShader;
int wiiuColorShaderInit = 0;
unsigned char wiiuColorShaderData[] = {
0x47, 0x66, 0x78, 0x32, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x07,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,

8
src/video/wiiu/wiiu_shaders.h
View File

@ -31,8 +31,8 @@
extern unsigned char wiiuTextureShaderData[];
extern unsigned char wiiuColorShaderData[];
WHBGfxShaderGroup wiiuTextureShader;
int wiiuTextureShaderInit = 0;
extern WHBGfxShaderGroup wiiuTextureShader;
extern int wiiuTextureShaderInit;
static inline void wiiuInitTextureShader() {
if (!wiiuTextureShaderInit) {
@ -56,8 +56,8 @@ static inline void wiiuSetTextureShader() {
GX2SetPixelShader(wiiuTextureShader.pixelShader);
}
WHBGfxShaderGroup wiiuColorShader;
int wiiuColorShaderInit = 0;
extern WHBGfxShaderGroup wiiuColorShader;
extern int wiiuColorShaderInit;
static inline void wiiuInitColorShader() {
if (!wiiuColorShaderInit) {