zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 00:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Bind the default framebuffer before testing whether hardware stereo 3D is supported. This allows Nvidia 3D vision glasses to function correctly when gl_light_shadowmap is ON.

Browse source 
Doc: Add "requires restart" to "enable quad stereo" option menu label, to help folks trying to setup 3D.
This commit is contained in:
Christopher Bruns 2017-12-27 13:05:13 -08:00 committed by Rachael Alexanderson
parent 1e7df5505e
commit a3399c1af2
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gl/stereo3d/gl_quadstereo.cpp
View file

@ -50,19 +50,19 @@ void QuadStereo::checkInitialRenderContextState()
{ {
// Keep trying until we see at least one good OpenGL context to render to // Keep trying until we see at least one good OpenGL context to render to
static bool bDecentContextWasFound = false; static bool bDecentContextWasFound = false;
if (!bDecentContextWasFound) { static int contextCheckCount = 0;
// I'm using a "random" OpenGL call (glGetFramebufferAttachmentParameteriv) if ( (! bDecentContextWasFound) && (contextCheckCount < 200) )
// that appears to correlate with whether the context is ready {
GLint attachmentType = GL_NONE; contextCheckCount += 1;
glGetFramebufferAttachmentParameteriv(GL_DRAW_FRAMEBUFFER, GL_FRONT_LEFT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &attachmentType); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); // This question is about the main screen display context
if (attachmentType != GL_NONE) // Finally, a useful OpenGL context GLboolean supportsStereo, supportsBuffered;
glGetBooleanv(GL_DOUBLEBUFFER, &supportsBuffered);
if (supportsBuffered) // Finally, a useful OpenGL context
{ {
// This block will be executed exactly ONCE during a game run // This block will be executed exactly ONCE during a game run
bDecentContextWasFound = true; // now we can stop checking every frame... bDecentContextWasFound = true; // now we can stop checking every frame...
// Now check whether this context supports hardware stereo // Now check whether this context supports hardware stereo
GLboolean supportsStereo, supportsBuffered;
glGetBooleanv(GL_STEREO, &supportsStereo); glGetBooleanv(GL_STEREO, &supportsStereo);
glGetBooleanv(GL_DOUBLEBUFFER, &supportsBuffered);
bQuadStereoSupported = supportsStereo && supportsBuffered; bQuadStereoSupported = supportsStereo && supportsBuffered;
leftEye.bQuadStereoSupported = bQuadStereoSupported; leftEye.bQuadStereoSupported = bQuadStereoSupported;
rightEye.bQuadStereoSupported = bQuadStereoSupported; rightEye.bQuadStereoSupported = bQuadStereoSupported;

2
wadsrc/static/language.enu
View file

@ -2725,7 +2725,7 @@ GLPREFMNU_AMBLIGHT = "Ambient light level";
GLPREFMNU_RENDERQUALITY = "Rendering quality"; GLPREFMNU_RENDERQUALITY = "Rendering quality";
GLPREFMNU_MENUBLUR = "Menu Blur"; GLPREFMNU_MENUBLUR = "Menu Blur";
GLPREFMNU_VRMODE = "Stereo 3D VR"; GLPREFMNU_VRMODE = "Stereo 3D VR";
GLPREFMNU_VRQUADSTEREO = "Enable Quad Stereo"; GLPREFMNU_VRQUADSTEREO = "Enable Quad Stereo (Requires Restart)";
GLPREFMNU_MULTISAMPLE = "Multisample"; GLPREFMNU_MULTISAMPLE = "Multisample";
GLPREFMNU_TONEMAP = "Tonemap Mode"; GLPREFMNU_TONEMAP = "Tonemap Mode";
GLPREFMNU_BLOOM = "Bloom effect"; GLPREFMNU_BLOOM = "Bloom effect";