From: Tobias Markus <tobbi@mozilla-uk.org>
Date: Mon, 3 Mar 2014 17:48:46 +0000 (+0100)
Subject: Try to use hardware surfaces instead of software ones
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a73d9e682d533d8d8733be634e5235585c647df6;p=supertux.git

Try to use hardware surfaces instead of software ones
---

diff --git a/src/video/gl/gl_renderer.cpp b/src/video/gl/gl_renderer.cpp
index 14d64e88b..6a2aa32c4 100644
--- a/src/video/gl/gl_renderer.cpp
+++ b/src/video/gl/gl_renderer.cpp
@@ -389,9 +389,9 @@ GLRenderer::do_take_screenshot()
   SDL_Surface *shot_surf;
   // create surface to hold screenshot
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-  shot_surf = SDL_CreateRGBSurface(SDL_SWSURFACE, SCREEN_WIDTH, SCREEN_HEIGHT, 24, 0x00FF0000, 0x0000FF00, 0x000000FF, 0);
+  shot_surf = SDL_CreateRGBSurface(SDL_HWSURFACE, SCREEN_WIDTH, SCREEN_HEIGHT, 24, 0x00FF0000, 0x0000FF00, 0x000000FF, 0);
 #else
-  shot_surf = SDL_CreateRGBSurface(SDL_SWSURFACE, SCREEN_WIDTH, SCREEN_HEIGHT, 24, 0x000000FF, 0x0000FF00, 0x00FF0000, 0);
+  shot_surf = SDL_CreateRGBSurface(SDL_HWSURFACE, SCREEN_WIDTH, SCREEN_HEIGHT, 24, 0x000000FF, 0x0000FF00, 0x00FF0000, 0);
 #endif
   if (!shot_surf) {
     log_warning << "Could not create RGB Surface to contain screenshot" << std::endl;
diff --git a/src/video/gl/gl_texture.cpp b/src/video/gl/gl_texture.cpp
index 599fb68d3..952e42426 100644
--- a/src/video/gl/gl_texture.cpp
+++ b/src/video/gl/gl_texture.cpp
@@ -93,11 +93,11 @@ GLTexture::GLTexture(SDL_Surface* image) :
   image_height = image->h;
 
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-  SDL_Surface* convert = SDL_CreateRGBSurface(SDL_SWSURFACE,
+  SDL_Surface* convert = SDL_CreateRGBSurface(SDL_HWSURFACE,
                                               texture_width, texture_height, 32,
                                               0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff);
 #else
-  SDL_Surface* convert = SDL_CreateRGBSurface(SDL_SWSURFACE,
+  SDL_Surface* convert = SDL_CreateRGBSurface(SDL_HWSURFACE,
                                               texture_width, texture_height, 32,
                                               0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
 #endif
diff --git a/src/video/sdl/sdl_renderer.cpp b/src/video/sdl/sdl_renderer.cpp
index 39e8860f8..10b48c3a2 100644
--- a/src/video/sdl/sdl_renderer.cpp
+++ b/src/video/sdl/sdl_renderer.cpp
@@ -127,7 +127,7 @@ SDLRenderer::SDLRenderer() :
   log_info << "Software to hardware blits with alpha are " << (info->blit_sw_A ? "" : "not ") << "accelerated." << std::endl;
   log_info << "Color fills are " << (info->blit_fill ? "" : "not ") << "accelerated." << std::endl;
 
-  int flags = SDL_SWSURFACE | SDL_ANYFORMAT;
+  int flags = SDL_HWSURFACE | SDL_ANYFORMAT;
   if(g_config->use_fullscreen)
     flags |= SDL_FULLSCREEN;