diff --git a/src/gl/compatibility/gl_20.cpp b/src/gl/compatibility/gl_20.cpp index 7e8ad093a..e059a3563 100644 --- a/src/gl/compatibility/gl_20.cpp +++ b/src/gl/compatibility/gl_20.cpp @@ -37,6 +37,7 @@ ** */ #include "gl/system/gl_system.h" +#include "menu/menu.h" #include "tarray.h" #include "doomtype.h" #include "m_argv.h" @@ -63,7 +64,7 @@ void gl_PatchMenu() { - if (gl.compatibility == CMPT_GL2) + if (gl.glslversion == 0) { // Radial fog and Doom lighting are not available in SM < 4 cards // The way they are implemented does not work well on older hardware. diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index 23c7a6318..60227ccae 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/src/gl/scene/gl_scene.cpp @@ -836,7 +836,7 @@ sector_t * FGLRenderer::RenderViewpoint (AActor * camera, GL_IRECT * bounds, flo SetProjection( eye->GetProjection(fov, ratio, fovratio) ); // SetProjection(fov, ratio, fovratio); // switch to perspective mode and set up clipper SetViewAngle(ViewAngle); - // Stereo mode specific viewpoint adjustment - temporarily shifts global viewx, viewy, viewz + // Stereo mode specific viewpoint adjustment - temporarily shifts global ViewPos eye->GetViewShift(GLRenderer->mAngles.Yaw.Degrees, viewShift); s3d::ScopedViewShifter viewShifter(viewShift); SetViewMatrix(ViewPos.X, ViewPos.Y, ViewPos.Z, false, false); diff --git a/src/gl/stereo3d/scoped_view_shifter.cpp b/src/gl/stereo3d/scoped_view_shifter.cpp index 5ecf1b0ab..f4274ed95 100644 --- a/src/gl/stereo3d/scoped_view_shifter.cpp +++ b/src/gl/stereo3d/scoped_view_shifter.cpp @@ -1,6 +1,6 @@ /* ** scoped_view_shifter.cpp -** Stack-scoped class for temporarily changing player viewpoint global variables viewx, viewy, viewz. +** Stack-scoped class for temporarily changing camera viewpoint ** Used for stereoscopic 3D. ** **--------------------------------------------------------------------------- diff --git a/src/gl/stereo3d/scoped_view_shifter.h b/src/gl/stereo3d/scoped_view_shifter.h index 8e31cecdf..8e39d533b 100644 --- a/src/gl/stereo3d/scoped_view_shifter.h +++ b/src/gl/stereo3d/scoped_view_shifter.h @@ -1,6 +1,6 @@ /* ** scoped_view_shifter.h -** Stack-scoped class for temporarily changing player viewpoint global variables viewx, viewy, viewz. +** Stack-scoped class for temporarily changing camera viewpoint ** Used for stereoscopic 3D. ** **--------------------------------------------------------------------------- @@ -43,7 +43,7 @@ namespace s3d { /** - * Temporarily shift viewx, viewy, viewz + * Temporarily shift */ class ScopedViewShifter {