From f8dd49e892482af784526f584da60f7b35692d98 Mon Sep 17 00:00:00 2001 From: Peter Evans Date: Thu, 5 Apr 2018 20:57:09 -0500 Subject: [PATCH] Revert "Separate window and renderer creation; use software rendering" This reverts commit c178e417b749035bc16aee048f15bb396462cb24. --- src/vm_screen.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/vm_screen.c b/src/vm_screen.c index 46567ee..808c4f5 100644 --- a/src/vm_screen.c +++ b/src/vm_screen.c @@ -110,23 +110,13 @@ vm_screen_add_window(vm_screen *screen, int width, int height) // If HEADLESS is defined, we will assume we _don't_ want an actual // drawing surface, but want to pretend we've added one. #ifndef HEADLESS - screen->window = SDL_CreateWindow("erc", - SDL_WINDOWPOS_UNDEFINED, - SDL_WINDOWPOS_UNDEFINED, - width, height, 0); + SDL_CreateWindowAndRenderer( + width, height, 0, &screen->window, &screen->render); - if (screen->window == NULL) { + if (screen->window == NULL || screen->render == NULL) { log_crit("Could not create window: %s", SDL_GetError()); return ERR_GFXINIT; } - - screen->render = SDL_CreateRenderer(screen->window, -1, - SDL_RENDERER_SOFTWARE); - - if (screen->render == NULL) { - log_crit("Could not create renderer: %s", SDL_GetError()); - return ERR_GFXINIT; - } #endif // We plan to draw onto a surface that is xcoords x ycoords in area, @@ -205,7 +195,7 @@ vm_screen_active(vm_screen *scr) void vm_screen_prepare(vm_screen *scr) { - //SDL_RenderClear(scr->render); + SDL_RenderClear(scr->render); } /*