shithub: choc

--- a/configure.ac

+++ b/configure.ac

@@ -118,6 +118,7 @@

 AC_SUBST(SDLNET_CFLAGS)

 AC_SUBST(SDLNET_LIBS)

+AC_SUBST(GL_LIBS)

 AC_SUBST(ac_aux_dir)

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -153,7 +153,8 @@

                @SDL_LIBS@                                  \

                @SDLMIXER_LIBS@                             \

                @SDLNET_LIBS@                               \

-               @SDLIMAGE_LIBS@

+               @SDLIMAGE_LIBS@                             \

+               @GL_LIBS@

 if HAVE_WINDRES

 @PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc

--- a/src/i_video.c

+++ b/src/i_video.c

@@ -19,6 +19,7 @@

 #include "SDL.h"

 #include "SDL_image.h"

+#include "SDL_opengl.h"

 #ifdef _WIN32

 #define WIN32_LEAN_AND_MEAN

@@ -116,6 +117,11 @@

 int aspect_ratio_correct = true;

+// Force software rendering, for systems which lack effective hardware

+// acceleration

+int force_software_renderer = false;

 // Time to wait for the screen to settle on startup before starting the

 // game (ms)

@@ -1006,7 +1012,7 @@

     int x, y;

     unsigned int rmask, gmask, bmask, amask;

     int unused_bpp;

-    int flags = 0;

+    int window_flags = 0, renderer_flags = 0;

     doompal = W_CacheLumpName(DEH_String("PLAYPAL"), PU_CACHE);

@@ -1034,33 +1040,35 @@

     // In windowed mode, the window can be resized while the game is

     // running.

-    flags = SDL_WINDOW_RESIZABLE;

+    window_flags = SDL_WINDOW_RESIZABLE;

     // Set the highdpi flag - this makes a big difference on Macs with

     // retina displays, especially when using small window sizes.

-    flags |= SDL_WINDOW_ALLOW_HIGHDPI;

+    window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;

     if (fullscreen)

         if (fullscreen_width == 0 && fullscreen_height == 0)

-            // This flags means "Never change the screen resolution! Instead,

-            // draw to the entire screen by scaling the texture appropriately".

-            flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;

+            // This window_flags means "Never change the screen resolution!

+            // Instead, draw to the entire screen by scaling the texture

+            // appropriately".

+            window_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;

         else

             w = fullscreen_width;

             h = fullscreen_height;

-            flags |= SDL_WINDOW_FULLSCREEN;

+            window_flags |= SDL_WINDOW_FULLSCREEN;

     // Create window and renderer contexts. We set the window title

-    // later anyway and leave the window position "undefined". If "flags"

-    // contains the fullscreen flag (see above), then w and h are ignored.

+    // later anyway and leave the window position "undefined". If

+    // "window_flags" contains the fullscreen flag (see above), then

+    // w and h are ignored.

-    screen = SDL_CreateWindow(NULL, x, y, w, h, flags);

+    screen = SDL_CreateWindow(NULL, x, y, w, h, window_flags);

     if (screen == NULL)

@@ -1071,9 +1079,15 @@

     // The SDL_RENDERER_TARGETTEXTURE flag is required to render the

     // intermediate texture into the upscaled texture.

+    renderer_flags = SDL_RENDERER_TARGETTEXTURE;

-    renderer = SDL_CreateRenderer(screen, -1, SDL_RENDERER_TARGETTEXTURE);

+    if (force_software_renderer)

+    {

+        renderer_flags |= SDL_RENDERER_SOFTWARE;

+    }

+    renderer = SDL_CreateRenderer(screen, -1, renderer_flags);

     if (renderer == NULL)

         I_Error("Error creating renderer for screen window: %s",

@@ -1134,6 +1148,30 @@

     CreateUpscaledTexture();

+static const char *hw_emu_warning =

+"===========================================================================\n"

+"WARNING: it looks like you are using a software GL implementation.\n"

+"To improve performance, try setting force_software_renderer in your\n"

+"configuration file.\n"

+"===========================================================================\n";

+static void CheckGLVersion(void)

+{

+    const char * version;

+    typedef const GLubyte* (APIENTRY * glStringFn_t)(GLenum);

+    glStringFn_t glfp = (glStringFn_t)SDL_GL_GetProcAddress("glGetString");

+    if (glfp)

+    {

+        version = (const char *)glfp(GL_VERSION);

+        if (version && strstr(version, "Mesa"))

+        {

+            printf("%s", hw_emu_warning);

+        }

+    }

+}

 void I_InitGraphics(void)

     SDL_Event dummy;

@@ -1176,6 +1214,10 @@

     AdjustWindowSize();

     SetVideoMode();

+    // We might have poor performance if we are using an emulated

+    // HW accelerator. Check for Mesa and warn if we're using it.

+    CheckGLVersion();

     // Start with a clear black screen

     // (screen will be flipped after we set the palette)

@@ -1233,6 +1275,7 @@

     M_BindIntVariable("startup_delay",             &startup_delay);

     M_BindIntVariable("fullscreen_width",          &fullscreen_width);

     M_BindIntVariable("fullscreen_height",         &fullscreen_height);

+    M_BindIntVariable("force_software_renderer",   &force_software_renderer);

     M_BindIntVariable("window_width",              &window_width);

     M_BindIntVariable("window_height",             &window_height);

     M_BindIntVariable("grabmouse",                 &grabmouse);

--- a/src/i_video.h

+++ b/src/i_video.h

@@ -92,5 +92,6 @@

 extern int screen_height;

 extern int fullscreen;

 extern int aspect_ratio_correct;

+extern int force_software_renderer;

 #endif

--- a/src/m_config.c

+++ b/src/m_config.c

@@ -900,6 +900,12 @@

     CONFIG_VARIABLE_STRING(window_position),

+    //!

+    // If non-zero, force the use of a software renderer. For use on

+    // systems lacking hardware acceleration.

+    //

+    CONFIG_VARIABLE_INT(force_software_renderer),

 #ifdef FEATURE_MULTIPLAYER

//!

--- a/src/setup/display.c

+++ b/src/setup/display.c

@@ -66,6 +66,7 @@

 static char *video_driver = "";

 static char *window_position = "";

 static int aspect_ratio_correct = 1;

+static int force_software_renderer = 0;

 static int fullscreen = 1;

 static int fullscreen_width = 0, fullscreen_height = 0;

 static int window_width = 640, window_height = 480;

@@ -254,6 +255,7 @@

     M_BindStringVariable("window_position",        &window_position);

     M_BindIntVariable("usegamma",                  &usegamma);

     M_BindIntVariable("png_screenshots",           &png_screenshots);

+    M_BindIntVariable("force_software_renderer",   &force_software_renderer);

     if (gamemission == doom || gamemission == heretic

      || gamemission == strife)