From 4f635983fcf791b52535b9c597bdc4e823fef635 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Wed, 1 Jun 2016 08:54:39 +0200
Subject: [PATCH] Add bgra support to OS X target

---
 src/posix/cocoa/i_video.mm | 30 +++++++++++++++++++++---------
 src/r_main.cpp             |  1 -
 src/r_swrenderer.cpp       |  1 +
 src/v_draw.cpp             |  6 ++++++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm
index c2eb58c6d..425fe5887 100644
--- a/src/posix/cocoa/i_video.mm
+++ b/src/posix/cocoa/i_video.mm
@@ -249,7 +249,7 @@ private:
 class CocoaFrameBuffer : public DFrameBuffer
 {
 public:
-	CocoaFrameBuffer(int width, int height, bool fullscreen);
+	CocoaFrameBuffer(int width, int height, bool bgra, bool fullscreen);
 	~CocoaFrameBuffer();
 
 	virtual bool Lock(bool buffer);
@@ -536,7 +536,7 @@ DFrameBuffer* CocoaVideo::CreateFrameBuffer(const int width, const int height, c
 
 	if (NULL != old)
 	{
-		if (width == m_width && height == m_height)
+		if (width == m_width && height == m_height && bgra == old->IsBgra())
 		{
 			SetMode(width, height, fullscreen, vid_hidpi);
 			return old;
@@ -553,7 +553,7 @@ DFrameBuffer* CocoaVideo::CreateFrameBuffer(const int width, const int height, c
 		delete old;
 	}
 
-	CocoaFrameBuffer* fb = new CocoaFrameBuffer(width, height, fullscreen);
+	CocoaFrameBuffer* fb = new CocoaFrameBuffer(width, height, bgra, fullscreen);
 	fb->SetFlash(flashColor, flashAmount);
 
 	SetMode(width, height, fullscreen, vid_hidpi);
@@ -772,8 +772,8 @@ CocoaVideo* CocoaVideo::GetInstance()
 }
 
 
-CocoaFrameBuffer::CocoaFrameBuffer(int width, int height, bool fullscreen)
-: DFrameBuffer(width, height, false)
+CocoaFrameBuffer::CocoaFrameBuffer(int width, int height, bool bgra, bool fullscreen)
+: DFrameBuffer(width, height, bgra)
 , m_needPaletteUpdate(false)
 , m_gamma(0.0f)
 , m_needGammaUpdate(false)
@@ -867,8 +867,18 @@ void CocoaFrameBuffer::Update()
 	FlipCycles.Reset();
 	BlitCycles.Clock();
 
-	GPfx.Convert(MemBuffer, Pitch, m_pixelBuffer, Width * BYTES_PER_PIXEL,
-		Width, Height, FRACUNIT, FRACUNIT, 0, 0);
+	if (IsBgra())
+	{
+		for (int y = 0; y < Height; y++)
+		{
+			memcpy((uint32_t*)m_pixelBuffer + y * Width, (uint32_t*)MemBuffer + y * Pitch, Width * BYTES_PER_PIXEL);
+		}
+	}
+	else
+	{
+		GPfx.Convert(MemBuffer, Pitch, m_pixelBuffer, Width * BYTES_PER_PIXEL,
+			Width, Height, FRACUNIT, FRACUNIT, 0, 0);
+	}
 
 	FlipCycles.Clock();
 	Flip();
@@ -1000,8 +1010,10 @@ void CocoaFrameBuffer::Flip()
 	static const GLenum format = GL_ABGR_EXT;
 #endif // __LITTLE_ENDIAN__
 
-	glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8,
-		Width, Height, 0, format, GL_UNSIGNED_BYTE, m_pixelBuffer);
+	if (IsBgra())
+		glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, Width, Height, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, m_pixelBuffer);
+	else
+		glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, Width, Height, 0, format, GL_UNSIGNED_BYTE, m_pixelBuffer);
 
 	glBegin(GL_QUADS);
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
diff --git a/src/r_main.cpp b/src/r_main.cpp
index aec8310d5..aaf8fc532 100644
--- a/src/r_main.cpp
+++ b/src/r_main.cpp
@@ -984,7 +984,6 @@ void R_RenderViewToCanvas (AActor *actor, DCanvas *canvas,
 
 	if (r_swtruecolor != canvas->IsBgra())
 	{
-		r_swtruecolor = canvas->IsBgra();
 		R_InitColumnDrawers();
 	}
 }
diff --git a/src/r_swrenderer.cpp b/src/r_swrenderer.cpp
index 15e2fda8f..ee6ac5fed 100644
--- a/src/r_swrenderer.cpp
+++ b/src/r_swrenderer.cpp
@@ -58,6 +58,7 @@ void R_InitRenderer();
 
 void FSoftwareRenderer::Init()
 {
+	r_swtruecolor = screen->IsBgra();
 	R_InitRenderer();
 }
 
diff --git a/src/v_draw.cpp b/src/v_draw.cpp
index b4f1ad4b5..57fac3cda 100644
--- a/src/v_draw.cpp
+++ b/src/v_draw.cpp
@@ -129,6 +129,12 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms)
 	static short bottomclipper[MAXWIDTH], topclipper[MAXWIDTH];
 	const BYTE *translation = NULL;
 
+	if (r_swtruecolor != IsBgra())
+	{
+		r_swtruecolor = IsBgra();
+		R_InitColumnDrawers();
+	}
+
 	if (parms.masked)
 	{
 		spanptr = &spans;