ShuriZma
/
redream
mirror of https://github.com/inolen/redream.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pass SDL_GL_GetProcAddress to glad's loader to avoid it having to locate the shared library as well 

set correct window width / height for android
set correct app dir for android
This commit is contained in:
Anthony Pesch 2017-06-20 18:32:54 -04:00
parent 185253e486
commit dad219f7fa
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/host/sdl_host.c
View File

@ -216,9 +216,8 @@ static video_context_t video_gl_create_context(struct sdl_host *host) {
CHECK_EQ(res, 0, "Failed to disable vsync"); CHECK_EQ(res, 0, "Failed to disable vsync");
/* link in gl functions at runtime */ /* link in gl functions at runtime */
res = gladLoadGL(); res = gladLoadGLLoader((GLADloadproc)&SDL_GL_GetProcAddress);
CHECK_EQ(res, 1, "GL initialization failed"); CHECK_EQ(res, 1, "GL initialization failed");
return (video_context_t)ctx; return (video_context_t)ctx;
} }
@ -266,7 +265,11 @@ struct render_backend *video_create_renderer(struct host *base) {
} }
int video_supports_multiple_contexts(struct host *host) { int video_supports_multiple_contexts(struct host *host) {
#if PLATFORM_ANDROID
return 0;
#else
return 1; return 1;
#endif
} }
int video_height(struct host *base) { int video_height(struct host *base) {
@ -738,15 +741,16 @@ struct sdl_host *host_create() {
int res = SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER); int res = SDL_Init(SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER);
CHECK_GE(res, 0, "SDL initialization failed: %s", SDL_GetError()); CHECK_GE(res, 0, "SDL initialization failed: %s", SDL_GetError());
host->video_width = VIDEO_DEFAULT_WIDTH;
host->video_height = VIDEO_DEFAULT_HEIGHT;
host->win = SDL_CreateWindow("redream", SDL_WINDOWPOS_UNDEFINED, host->win = SDL_CreateWindow("redream", SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, host->video_width, SDL_WINDOWPOS_UNDEFINED, VIDEO_DEFAULT_WIDTH,
host->video_height, VIDEO_DEFAULT_HEIGHT,
SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE); SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
CHECK_NOTNULL(host->win, "Window creation failed: %s", SDL_GetError()); CHECK_NOTNULL(host->win, "Window creation failed: %s", SDL_GetError());
/* immediately poll window size for platforms like Android where the window
starts fullscreen, ignoring the default width and height */
SDL_GetWindowSize(host->win, &host->video_width, &host->video_height);
if (!audio_init(host)) { if (!audio_init(host)) {
host_destroy(host); host_destroy(host);
return NULL; return NULL;
@ -766,13 +770,19 @@ struct sdl_host *host_create() {
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
/* set application directory */ /* set application directory */
char appdir[PATH_MAX]; #if PLATFORM_ANDROID
const char *appdir = SDL_AndroidGetExternalStoragePath();
fs_set_appdir(appdir);
#else
char userdir[PATH_MAX]; char userdir[PATH_MAX];
int r = fs_userdir(userdir, sizeof(userdir)); int r = fs_userdir(userdir, sizeof(userdir));
CHECK(r); CHECK(r);
char appdir[PATH_MAX];
snprintf(appdir, sizeof(appdir), "%s" PATH_SEPARATOR ".redream", userdir); snprintf(appdir, sizeof(appdir), "%s" PATH_SEPARATOR ".redream", userdir);
fs_set_appdir(appdir); fs_set_appdir(appdir);
#endif
/* load base options from config */ /* load base options from config */
char config[PATH_MAX] = {0}; char config[PATH_MAX] = {0};