mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-28 15:02:01 +00:00
fixed: Delay setup of quad-buffered stereo 3d mode, in case a useful OpenGL context is not immediately provided.
This commit is contained in:
parent
66c5121e38
commit
924aaa3a92
2 changed files with 41 additions and 11 deletions
|
@ -45,17 +45,38 @@ QuadStereo::QuadStereo(double ipdMeters)
|
||||||
// Check whether quad-buffered stereo is supported in the current context
|
// Check whether quad-buffered stereo is supported in the current context
|
||||||
// We are assuming the OpenGL context is already current at this point,
|
// We are assuming the OpenGL context is already current at this point,
|
||||||
// i.e. this constructor is called "just in time".
|
// i.e. this constructor is called "just in time".
|
||||||
GLboolean supportsStereo, supportsBuffered;
|
|
||||||
glGetBooleanv(GL_STEREO, &supportsStereo);
|
|
||||||
glGetBooleanv(GL_DOUBLEBUFFER, &supportsBuffered);
|
|
||||||
bQuadStereoSupported = supportsStereo && supportsBuffered;
|
|
||||||
leftEye.bQuadStereoSupported = bQuadStereoSupported;
|
|
||||||
rightEye.bQuadStereoSupported = bQuadStereoSupported;
|
|
||||||
|
|
||||||
eye_ptrs.Push(&leftEye);
|
// First initialize to mono-ish initial state
|
||||||
// If stereo is not supported, just draw scene once (left eye view only)
|
bQuadStereoSupported = leftEye.bQuadStereoSupported = rightEye.bQuadStereoSupported = false;
|
||||||
if (bQuadStereoSupported) {
|
eye_ptrs.Push(&leftEye); // We ALWAYS want to show at least this one view...
|
||||||
eye_ptrs.Push(&rightEye);
|
// We will possibly advance to true stereo mode in the Setup() method...
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sometimes the stereo render context is not ready immediately at start up
|
||||||
|
/* private */
|
||||||
|
void QuadStereo::checkInitialRenderContextState()
|
||||||
|
{
|
||||||
|
// Keep trying until we see at least one good OpenGL context to render to
|
||||||
|
static bool bDecentContextWasFound = false;
|
||||||
|
if (!bDecentContextWasFound) {
|
||||||
|
// I'm using a "random" OpenGL call (glGetFramebufferAttachmentParameteriv)
|
||||||
|
// that appears to correlate with whether the context is ready
|
||||||
|
GLint attachmentType = GL_NONE;
|
||||||
|
glGetFramebufferAttachmentParameteriv(GL_DRAW_FRAMEBUFFER, GL_FRONT_LEFT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &attachmentType);
|
||||||
|
if (attachmentType != GL_NONE) // Finally, a useful OpenGL context
|
||||||
|
{
|
||||||
|
// This block will be executed exactly ONCE during a game run
|
||||||
|
bDecentContextWasFound = true; // now we can stop checking every frame...
|
||||||
|
// Now check whether this context supports hardware stereo
|
||||||
|
GLboolean supportsStereo, supportsBuffered;
|
||||||
|
glGetBooleanv(GL_STEREO, &supportsStereo);
|
||||||
|
glGetBooleanv(GL_DOUBLEBUFFER, &supportsBuffered);
|
||||||
|
bQuadStereoSupported = supportsStereo && supportsBuffered;
|
||||||
|
leftEye.bQuadStereoSupported = bQuadStereoSupported;
|
||||||
|
rightEye.bQuadStereoSupported = bQuadStereoSupported;
|
||||||
|
if (bQuadStereoSupported)
|
||||||
|
eye_ptrs.Push(&rightEye); // Use the other eye too, if we can do stereo
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,11 +102,18 @@ void QuadStereo::Present() const
|
||||||
{
|
{
|
||||||
GLRenderer->mBuffers->BindOutputFB();
|
GLRenderer->mBuffers->BindOutputFB();
|
||||||
GLRenderer->ClearBorders();
|
GLRenderer->ClearBorders();
|
||||||
GLRenderer->mBuffers->BindEyeTexture(1, 0);
|
GLRenderer->mBuffers->BindEyeTexture(0, 0);
|
||||||
GLRenderer->DrawPresentTexture(GLRenderer->mOutputLetterbox, true);
|
GLRenderer->DrawPresentTexture(GLRenderer->mOutputLetterbox, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void QuadStereo::SetUp() const
|
||||||
|
{
|
||||||
|
Stereo3DMode::SetUp();
|
||||||
|
// Maybe advance to true stereo mode (ONCE), after the stereo context is finally ready
|
||||||
|
const_cast<QuadStereo*>(this)->checkInitialRenderContextState();
|
||||||
|
}
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
const QuadStereo& QuadStereo::getInstance(float ipd)
|
const QuadStereo& QuadStereo::getInstance(float ipd)
|
||||||
{
|
{
|
||||||
|
|
|
@ -69,11 +69,13 @@ class QuadStereo : public Stereo3DMode
|
||||||
public:
|
public:
|
||||||
QuadStereo(double ipdMeters);
|
QuadStereo(double ipdMeters);
|
||||||
void Present() const override;
|
void Present() const override;
|
||||||
|
void SetUp() const override;
|
||||||
static const QuadStereo& getInstance(float ipd);
|
static const QuadStereo& getInstance(float ipd);
|
||||||
private:
|
private:
|
||||||
QuadStereoLeftPose leftEye;
|
QuadStereoLeftPose leftEye;
|
||||||
QuadStereoRightPose rightEye;
|
QuadStereoRightPose rightEye;
|
||||||
bool bQuadStereoSupported;
|
bool bQuadStereoSupported;
|
||||||
|
void checkInitialRenderContextState();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue