zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-16 17:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Since the engine can no longer change renderers on the fly, thanks to ZDoom's messed up video startup code, we have to abort with a fatal error if we can't create a GL context. Otherwise the user will never see a meaningful message.

Browse source
This commit is contained in:
Christoph Oelckers 2014-10-06 10:00:02 +02:00
parent 3e2a17538b
commit 5d032f3fcf
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/scene/gl_weapon.cpp
View file

@ -388,7 +388,7 @@ void FGLRenderer::DrawPlayerSprites(sector_t * viewsector, bool hudModelStep)
} }
else else
{ {
if (gl_lights && GLRenderer->mLightCount && !gl_fixedcolormap) if (gl_lights && GLRenderer->mLightCount && !gl_fixedcolormap && gl_light_sprites)
{ {
gl_SetDynSpriteLight(playermo, NULL); gl_SetDynSpriteLight(playermo, NULL);
} }

13
src/win32/win32gliface.cpp
View file

@ -20,6 +20,7 @@
#include "doomstat.h" #include "doomstat.h"
#include "v_text.h" #include "v_text.h"
#include "m_argv.h" #include "m_argv.h"
#include "doomerrors.h"
//#include "gl_defs.h" //#include "gl_defs.h"
#include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderer.h"
@ -378,9 +379,7 @@ DFrameBuffer *Win32GLVideo::CreateFrameBuffer(int width, int height, bool fs, DF
//old->GetFlash(flashColor, flashAmount); //old->GetFlash(flashColor, flashAmount);
delete old; delete old;
} }
fb = new OpenGLFrameBuffer(m_hMonitor, m_DisplayWidth, m_DisplayHeight, m_DisplayBits, m_DisplayHz, fs); fb = new OpenGLFrameBuffer(m_hMonitor, m_DisplayWidth, m_DisplayHeight, m_DisplayBits, m_DisplayHz, fs);
return fb; return fb;
} }
@ -707,14 +706,14 @@ bool Win32GLVideo::SetupPixelFormat(int multisample)
if (pfd.dwFlags & PFD_GENERIC_FORMAT) if (pfd.dwFlags & PFD_GENERIC_FORMAT)
{ {
Printf("R_OPENGL: OpenGL driver not accelerated! Falling back to software renderer.\n"); I_Error("R_OPENGL: OpenGL driver not accelerated!");
return false; return false;
} }
} }
if (!::SetPixelFormat(m_hDC, pixelFormat, NULL)) if (!::SetPixelFormat(m_hDC, pixelFormat, NULL))
{ {
Printf("R_OPENGL: Couldn't set pixel format.\n"); I_Error("R_OPENGL: Couldn't set pixel format.\n");
return false; return false;
} }
return true; return true;
@ -765,7 +764,7 @@ bool Win32GLVideo::InitHardware (HWND Window, int multisample)
if (!SetupPixelFormat(multisample)) if (!SetupPixelFormat(multisample))
{ {
Printf ("R_OPENGL: Reverting to software mode...\n"); I_Error ("R_OPENGL: Unabl...\n");
return false; return false;
} }
@ -795,7 +794,7 @@ bool Win32GLVideo::InitHardware (HWND Window, int multisample)
if (m_hRC == NULL && prof == WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB) if (m_hRC == NULL && prof == WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB)
{ {
Printf("R_OPENGL: Couldn't create render context. Reverting to software mode...\n"); I_Error ("R_OPENGL: Unable to create an OpenGL 3.x render context.\n");
return false; return false;
} }
@ -815,6 +814,8 @@ bool Win32GLVideo::InitHardware (HWND Window, int multisample)
} }
} }
} }
// We get here if the driver doesn't support the modern context creation API which always means an old driver.
I_Error ("R_OPENGL: Unable to create an OpenGL 3.x render context.\n");
return false; return false;
} }