From 491898fe2c628ba086659f05f6f251ef9c85ab1f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 24 Jun 2018 17:15:27 +0200
Subject: [PATCH] - fixed calculation of projection matrix for weapon sprites.
 - fixed color mask for green/magenta. - fixed crash when initializing video,
 because it was accessing 'screen' before it was set from within the
 framebuffer's constructor.

---
 src/gl/renderer/gl_stereo3d.cpp       |  2 +-
 src/gl/system/gl_framebuffer.cpp      |  2 +-
 src/hwrenderer/utility/hw_vrmodes.cpp | 12 ++++++------
 src/hwrenderer/utility/hw_vrmodes.h   |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/gl/renderer/gl_stereo3d.cpp b/src/gl/renderer/gl_stereo3d.cpp
index 6035a67bf..3155bbdc5 100644
--- a/src/gl/renderer/gl_stereo3d.cpp
+++ b/src/gl/renderer/gl_stereo3d.cpp
@@ -324,7 +324,7 @@ void FGLRenderer::PresentStereo()
 		return;
 
 	case VR_GREENMAGENTA:
-		PresentAnaglyph(false, true, true);
+		PresentAnaglyph(false, true, false);
 		break;
 
 	case VR_REDCYAN:
diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp
index 451a9f7cb..c30f22c63 100644
--- a/src/gl/system/gl_framebuffer.cpp
+++ b/src/gl/system/gl_framebuffer.cpp
@@ -377,7 +377,7 @@ void OpenGLFrameBuffer::SetViewportRects(IntRect *bounds)
 	if (!bounds)
 	{
 		auto vrmode = VRMode::GetVRMode(true);
-		vrmode->AdjustViewport();
+		vrmode->AdjustViewport(this);
 	}
 }
 
diff --git a/src/hwrenderer/utility/hw_vrmodes.cpp b/src/hwrenderer/utility/hw_vrmodes.cpp
index d43ad1f76..ebb2aad9f 100644
--- a/src/hwrenderer/utility/hw_vrmodes.cpp
+++ b/src/hwrenderer/utility/hw_vrmodes.cpp
@@ -93,7 +93,7 @@ const VRMode *VRMode::GetVRMode(bool toscreen)
 	}
 }
 
-void VRMode::AdjustViewport() const
+void VRMode::AdjustViewport(DFrameBuffer *screen) const
 {
 	screen->mSceneViewport.height = (int)(screen->mSceneViewport.height * mVerticalViewportScale);
 	screen->mSceneViewport.top = (int)(screen->mSceneViewport.top * mVerticalViewportScale);
@@ -109,11 +109,11 @@ void VRMode::AdjustViewport() const
 VSMatrix VRMode::GetHUDSpriteProjection() const
 {
 	VSMatrix mat;
-	int w = screen->mScreenViewport.width;
-	int h = screen->mScreenViewport.height;
-	float scaled_w = w * mWeaponProjectionScale;
-	float left_ofs = (scaled_w - w) / 2.f;
-	mat.ortho(left_ofs, left_ofs + w, (float)h, 0, -1.0f, 1.0f);
+	int w = screen->GetWidth();
+	int h = screen->GetHeight();
+	float scaled_w = w / mWeaponProjectionScale;
+	float left_ofs = (w - scaled_w) / 2.f;
+	mat.ortho(left_ofs, left_ofs + scaled_w, (float)h, 0, -1.0f, 1.0f);
 	return mat;
 }
 
diff --git a/src/hwrenderer/utility/hw_vrmodes.h b/src/hwrenderer/utility/hw_vrmodes.h
index db4fe3985..43caa83d7 100644
--- a/src/hwrenderer/utility/hw_vrmodes.h
+++ b/src/hwrenderer/utility/hw_vrmodes.h
@@ -2,6 +2,7 @@
 
 #include "r_data/matrix.h"
 
+class DFrameBuffer;
 
 enum
 {
@@ -41,6 +42,6 @@ struct VRMode
 	VREyeInfo mEyes[2];
 
 	static const VRMode *GetVRMode(bool toscreen = true);
-	void AdjustViewport() const;
+	void AdjustViewport(DFrameBuffer *fb) const;
 	VSMatrix GetHUDSpriteProjection() const;
 };