X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=734307d55709d84060e2894492bb298b7eacd81d;hb=faad97c450f035fb84748e8ca72048e53c92de78;hp=26cc7a7b103076df0c2d228ad8041f54744c506d;hpb=e5367ee42312c8835125438511d8479aa2daa094;p=rocksndiamonds.git diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 26cc7a7b..734307d5 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -26,9 +26,11 @@ /* SDL internal variables */ #if defined(TARGET_SDL2) -// static SDL_Window *sdl_window = NULL; -SDL_Window *sdl_window = NULL; -// static SDL_Renderer *sdl_renderer = NULL; +static SDL_Window *sdl_window = NULL; +static SDL_Renderer *sdl_renderer = NULL; +static SDL_Texture *sdl_texture = NULL; + +#define USE_RENDERER 1 #endif /* stuff needed to work around SDL/Windows fullscreen drawing bug */ @@ -42,8 +44,54 @@ static int video_yoffset; /* functions from SGE library */ void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32); +#if defined(TARGET_SDL2) +static void UpdateScreen(SDL_Rect *rect) +{ +#if USE_RENDERER + SDL_Surface *screen = backbuffer->surface; + +#if 1 + if (rect) + { + int bytes_x = screen->pitch / video.width; + int bytes_y = screen->pitch; + + if (video.fullscreen_enabled) + bytes_x = screen->pitch / fullscreen_width; + + SDL_UpdateTexture(sdl_texture, rect, + screen->pixels + rect->x * bytes_x + rect->y * bytes_y, + screen->pitch); + } + else + { + SDL_UpdateTexture(sdl_texture, NULL, screen->pixels, screen->pitch); + } +#else + SDL_UpdateTexture(sdl_texture, NULL, screen->pixels, screen->pitch); +#endif + SDL_RenderClear(sdl_renderer); + SDL_RenderCopy(sdl_renderer, sdl_texture, NULL, NULL); + SDL_RenderPresent(sdl_renderer); +#else + if (rect) + SDL_UpdateWindowSurfaceRects(sdl_window, rect, 1); + else + SDL_UpdateWindowSurface(sdl_window); +#endif +} +#endif + static void setFullscreenParameters(char *fullscreen_mode_string) { +#if defined(TARGET_SDL2) + fullscreen_width = video.width; + fullscreen_height = video.height; + fullscreen_xoffset = 0; + fullscreen_yoffset = 0; + +#else + struct ScreenModeInfo *fullscreen_mode; int i; @@ -66,6 +114,7 @@ static void setFullscreenParameters(char *fullscreen_mode_string) break; } } +#endif } static void SDLSetWindowIcon(char *basename) @@ -138,6 +187,7 @@ void SDLInitVideoDisplay(void) void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, boolean fullscreen) { +#if !defined(TARGET_SDL2) static int screen_xy[][2] = { { 640, 480 }, @@ -145,7 +195,8 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, { 1024, 768 }, { -1, -1 } }; - SDL_Rect **modes; +#endif + SDL_Rect **modes = NULL; int i, j; /* default: normal game window size */ @@ -154,6 +205,7 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, fullscreen_xoffset = 0; fullscreen_yoffset = 0; +#if !defined(TARGET_SDL2) for (i = 0; screen_xy[i][0] != -1; i++) { if (screen_xy[i][0] >= video.width && screen_xy[i][1] >= video.height) @@ -167,6 +219,7 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, fullscreen_xoffset = (fullscreen_width - video.width) / 2; fullscreen_yoffset = (fullscreen_height - video.height) / 2; +#endif #if 1 checked_free(video.fullscreen_modes); @@ -175,12 +228,37 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, video.fullscreen_mode_current = NULL; #endif -#if !defined(TARGET_SDL2) +#if defined(TARGET_SDL2) + int num_displays = SDL_GetNumVideoDisplays(); + + if (num_displays > 0) + { + // currently only display modes of first display supported + int num_modes = SDL_GetNumDisplayModes(0); + + if (num_modes > 0) + { + modes = checked_calloc((num_modes + 1) * sizeof(SDL_Rect *)); + + for (i = 0; i < num_modes; i++) + { + SDL_DisplayMode mode; + + if (SDL_GetDisplayMode(0, i, &mode) < 0) + break; + + modes[i] = checked_calloc(sizeof(SDL_Rect)); + + modes[i]->w = mode.w; + modes[i]->h = mode.h; + } + } + } + +#else + /* get available hardware supported fullscreen modes */ modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); -#else - // (for now, no display modes in SDL2 -- change this later) - modes = NULL; #endif if (modes == NULL) @@ -205,7 +283,7 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, /* in this case, a certain number of screen modes is available */ int num_modes = 0; - for(i = 0; modes[i] != NULL; i++) + for (i = 0; modes[i] != NULL; i++) { boolean found_mode = FALSE; @@ -244,13 +322,31 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, } } +#if defined(TARGET_SDL2) + if (modes) + { + for (i = 0; modes[i] != NULL; i++) + checked_free(modes[i]); + + checked_free(modes); + } +#endif + +#if 0 /* set window icon */ SDLSetWindowIcon(program.sdl_icon_filename); +#endif /* open SDL video output device (window or fullscreen mode) */ if (!SDLSetVideoMode(backbuffer, fullscreen)) Error(ERR_EXIT, "setting video mode failed"); +#if 1 + /* !!! SDL2 can only set the window icon if the window already exists !!! */ + /* set window icon */ + SDLSetWindowIcon(program.sdl_icon_filename); +#endif + /* set window and icon title */ #if defined(TARGET_SDL2) SDL_SetWindowTitle(sdl_window, program.window_title); @@ -279,15 +375,140 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, #endif } +static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer, + boolean fullscreen) +{ + SDL_Surface *new_surface = NULL; + + int surface_flags_window = SURFACE_FLAGS; +#if defined(TARGET_SDL2) + +#if 1 + int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN_DESKTOP; +#else + // (never used with SDL2 now) + int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN; +#endif + +#else + int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN; +#endif + + int width = (fullscreen ? fullscreen_width : video.width); + int height = (fullscreen ? fullscreen_height : video.height); + int surface_flags = (fullscreen ? surface_flags_fullscreen : + surface_flags_window); + +#if defined(TARGET_SDL2) + +#if USE_RENDERER + float scale_factor = 1.2; + + if ((*backbuffer)->surface) + SDL_FreeSurface((*backbuffer)->surface); + + if (sdl_texture) + SDL_DestroyTexture(sdl_texture); + + if (sdl_renderer) + SDL_DestroyRenderer(sdl_renderer); + + if (sdl_window) + SDL_DestroyWindow(sdl_window); + + sdl_window = SDL_CreateWindow(program.window_title, + SDL_WINDOWPOS_CENTERED, + SDL_WINDOWPOS_CENTERED, + (int)(scale_factor * width), + (int)(scale_factor * height), + surface_flags); + + if (sdl_window != NULL) + { + sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0); + + if (sdl_renderer != NULL) + { + SDL_RenderSetLogicalSize(sdl_renderer, width, height); + SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); + + sdl_texture = SDL_CreateTexture(sdl_renderer, + SDL_PIXELFORMAT_ARGB8888, + SDL_TEXTUREACCESS_STREAMING, + width, height); + + if (sdl_texture != NULL) + { +#if 1 + // (do not use alpha channel) + new_surface = SDL_CreateRGBSurface(0, width, height, 32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0x00000000); +#else + // (this uses an alpha channel, which we don't want here) + new_surface = SDL_CreateRGBSurface(0, width, height, 32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); +#endif + + if (new_surface == NULL) + Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", + SDL_GetError()); + } + else + { + Error(ERR_WARN, "SDL_CreateTexture() failed: %s", SDL_GetError()); + } + } + else + { + Error(ERR_WARN, "SDL_CreateRenderer() failed: %s", SDL_GetError()); + } + } + else + { + Error(ERR_WARN, "SDL_CreateWindow() failed: %s", SDL_GetError()); + } + +#else + + if (sdl_window) + SDL_DestroyWindow(sdl_window); + + sdl_window = SDL_CreateWindow(program.window_title, + SDL_WINDOWPOS_CENTERED, + SDL_WINDOWPOS_CENTERED, + width, height, + surface_flags); + + if (sdl_window != NULL) + new_surface = SDL_GetWindowSurface(sdl_window); +#endif + +#else + new_surface = SDL_SetVideoMode(width, height, video.depth, surface_flags); +#endif + + return new_surface; +} + boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) { boolean success = TRUE; +#if 1 +#else #if defined(TARGET_SDL2) - int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN; + // int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN; + int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN_DESKTOP; int surface_flags_window = SURFACE_FLAGS; #else int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN; int surface_flags_window = SURFACE_FLAGS; +#endif #endif SDL_Surface *new_surface = NULL; @@ -306,6 +527,10 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) video_yoffset = fullscreen_yoffset; /* switch display to fullscreen mode, if available */ +#if 1 + new_surface = SDLCreateScreen(backbuffer, TRUE); +#else + #if defined(TARGET_SDL2) sdl_window = SDL_CreateWindow(program.window_title, SDL_WINDOWPOS_CENTERED, @@ -316,11 +541,13 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) { new_surface = SDL_GetWindowSurface(sdl_window); - SDL_UpdateWindowSurface(sdl_window); // immediately map window + // SDL_UpdateWindowSurface(sdl_window); // immediately map window + // UpdateScreen(NULL); // immediately map window } #else new_surface = SDL_SetVideoMode(fullscreen_width, fullscreen_height, video.depth, surface_flags_fullscreen); +#endif #endif if (new_surface == NULL) @@ -350,21 +577,112 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) video_yoffset = 0; /* switch display to window mode */ +#if 1 + new_surface = SDLCreateScreen(backbuffer, FALSE); +#else + #if defined(TARGET_SDL2) + +#if USE_RENDERER + float scale_factor = 1.2; + int test_fullscreen = 0; + int surface_flags = (test_fullscreen ? surface_flags_fullscreen : + surface_flags_window); + + if ((*backbuffer)->surface) + SDL_FreeSurface((*backbuffer)->surface); + + if (sdl_texture) + SDL_DestroyTexture(sdl_texture); + + if (sdl_renderer) + SDL_DestroyRenderer(sdl_renderer); + + if (sdl_window) + SDL_DestroyWindow(sdl_window); + + sdl_window = SDL_CreateWindow(program.window_title, + SDL_WINDOWPOS_CENTERED, + SDL_WINDOWPOS_CENTERED, + (int)(scale_factor * video.width), + (int)(scale_factor * video.height), + surface_flags); + + if (sdl_window != NULL) + { + sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0); + + if (sdl_renderer != NULL) + { + SDL_RenderSetLogicalSize(sdl_renderer, video.width, video.height); + SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); + + sdl_texture = SDL_CreateTexture(sdl_renderer, + SDL_PIXELFORMAT_ARGB8888, + SDL_TEXTUREACCESS_STREAMING, + video.width, video.height); + + if (sdl_texture != NULL) + { +#if 1 + // (do not use alpha channel) + new_surface = SDL_CreateRGBSurface(0, video.width, video.height, 32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0x00000000); +#else + // (this uses an alpha channel, which we don't want here) + new_surface = SDL_CreateRGBSurface(0, video.width, video.height, 32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); +#endif + + if (new_surface == NULL) + Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", + SDL_GetError()); + } + else + { + Error(ERR_WARN, "SDL_CreateTexture() failed: %s", SDL_GetError()); + } + } + else + { + Error(ERR_WARN, "SDL_CreateRenderer() failed: %s", SDL_GetError()); + } + } + else + { + Error(ERR_WARN, "SDL_CreateWindow() failed: %s", SDL_GetError()); + } + +#else + + if (sdl_window) + SDL_DestroyWindow(sdl_window); + sdl_window = SDL_CreateWindow(program.window_title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, video.width, video.height, surface_flags_window); + if (sdl_window != NULL) { new_surface = SDL_GetWindowSurface(sdl_window); - SDL_UpdateWindowSurface(sdl_window); // immediately map window + // SDL_UpdateWindowSurface(sdl_window); // immediately map window + // UpdateScreen(NULL); // immediately map window } +#endif + #else new_surface = SDL_SetVideoMode(video.width, video.height, video.depth, surface_flags_window); +#endif #endif if (new_surface == NULL) @@ -384,6 +702,10 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) } } +#if defined(TARGET_SDL2) + UpdateScreen(NULL); // map window +#endif + #if 1 SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE); @@ -402,7 +724,6 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) #endif #endif - return success; } @@ -463,14 +784,19 @@ void SDLCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, dst_rect.w = width; dst_rect.h = height; - if (src_bitmap != backbuffer || dst_bitmap != window) + // if (src_bitmap != backbuffer || dst_bitmap != window) + if (!(src_bitmap == backbuffer && dst_bitmap == window)) SDL_BlitSurface((mask_mode == BLIT_MASKED ? src_bitmap->surface_masked : src_bitmap->surface), &src_rect, real_dst_bitmap->surface, &dst_rect); #if defined(TARGET_SDL2) if (dst_bitmap == window) - SDL_UpdateWindowSurface(sdl_window); + { + // SDL_UpdateWindowSurface(sdl_window); + // SDL_UpdateWindowSurfaceRects(sdl_window, &dst_rect, 1); + UpdateScreen(&dst_rect); + } #else if (dst_bitmap == window) SDL_UpdateRect(backbuffer->surface, dst_x, dst_y, width, height); @@ -498,7 +824,11 @@ void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y, int width, int height, #if defined(TARGET_SDL2) if (dst_bitmap == window) - SDL_UpdateWindowSurface(sdl_window); + { + // SDL_UpdateWindowSurface(sdl_window); + // SDL_UpdateWindowSurfaceRects(sdl_window, &rect, 1); + UpdateScreen(&rect); + } #else if (dst_bitmap == window) SDL_UpdateRect(backbuffer->surface, x, y, width, height); @@ -516,6 +846,9 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, SDL_Surface *surface_screen = backbuffer->surface; SDL_Surface *surface_cross = (bitmap_cross ? bitmap_cross->surface : NULL); SDL_Rect src_rect, dst_rect; +#if defined(TARGET_SDL2) + SDL_Rect dst_rect2; +#endif int src_x = x, src_y = y; int dst_x = x, dst_y = y; unsigned int time_last, time_current; @@ -544,6 +877,10 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, dst_rect.w = width; /* (ignored) */ dst_rect.h = height; /* (ignored) */ +#if defined(TARGET_SDL2) + dst_rect2 = dst_rect; +#endif + if (initialization_needed) { #if defined(TARGET_SDL2) @@ -739,7 +1076,9 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, draw_border_function(); #if defined(TARGET_SDL2) - SDL_UpdateWindowSurface(sdl_window); + // SDL_UpdateWindowSurface(sdl_window); + // SDL_UpdateWindowSurfaceRects(sdl_window, &dst_rect2, 1); + UpdateScreen(&dst_rect2); #else SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height); #endif @@ -776,7 +1115,9 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, #if 1 /* only update the region of the screen that is affected from fading */ #if defined(TARGET_SDL2) - SDL_UpdateWindowSurface(sdl_window); + // SDL_UpdateWindowSurface(sdl_window); + // SDL_UpdateWindowSurfaceRects(sdl_window, &dst_rect, 1); + UpdateScreen(&dst_rect); #else SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height); #endif @@ -1788,6 +2129,10 @@ Bitmap *SDLLoadImage(char *filename) Bitmap *new_bitmap = CreateBitmapStruct(); SDL_Surface *sdl_image_tmp; + print_timestamp_init("SDLLoadImage"); + + print_timestamp_time(getBaseNamePtr(filename)); + /* load image to temporary surface */ if ((sdl_image_tmp = IMG_Load(filename)) == NULL) { @@ -1796,6 +2141,8 @@ Bitmap *SDLLoadImage(char *filename) return NULL; } + print_timestamp_time("IMG_Load"); + UPDATE_BUSY_STATE(); /* create native non-transparent surface for current image */ @@ -1806,6 +2153,8 @@ Bitmap *SDLLoadImage(char *filename) return NULL; } + print_timestamp_time("SDL_DisplayFormat (opaque)"); + UPDATE_BUSY_STATE(); /* create native transparent surface for current image */ @@ -1818,6 +2167,8 @@ Bitmap *SDLLoadImage(char *filename) return NULL; } + print_timestamp_time("SDL_DisplayFormat (masked)"); + UPDATE_BUSY_STATE(); /* free temporary surface */ @@ -1826,6 +2177,8 @@ Bitmap *SDLLoadImage(char *filename) new_bitmap->width = new_bitmap->surface->w; new_bitmap->height = new_bitmap->surface->h; + print_timestamp_done("SDLLoadImage"); + return new_bitmap; }