From 034e3aabc81219ca3804bfa6483d6667c3ab5679 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Mon, 19 May 2014 15:21:55 -0700
Subject: [PATCH] Improved clarity and whitespace

Changed QGL version to 3,2 in order to be less restrictive, yet it should still change up to 4,1 on OSX on Qt5.
---
 src/citra_qt/bootmanager.cpp  | 2 +-
 src/common/chunk_file.h       | 1 +
 src/video_core/utils.cpp      | 6 +++---
 src/video_core/video_core.cpp | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index bd01b78c5c..7089b9f97c 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -104,7 +104,7 @@ GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this
     // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose
     QGLFormat fmt;
     fmt.setProfile(QGLFormat::CoreProfile);
-    fmt.setVersion(4,1);
+    fmt.setVersion(3,2);
     fmt.setSampleBuffers(true);
     fmt.setSamples(4);
     
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index c6a7cee35f..8c9f839dac 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -654,6 +654,7 @@ inline PointerWrapSection::~PointerWrapSection() {
 }
 
 
+// Commented out because it is currently unused, and breaks builds on OSX
 /*class CChunkFileReader
 {
 public:
diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp
index a90fc183b6..b94376ac12 100644
--- a/src/video_core/utils.cpp
+++ b/src/video_core/utils.cpp
@@ -20,13 +20,13 @@ void DumpTGA(std::string filename, int width, int height, u8* raw_data) {
     TGAHeader hdr;
     FILE* fout;
     u8 r, g, b;
-    
+
     memset(&hdr, 0, sizeof(hdr));
     hdr.datatypecode = 2; // uncompressed RGB
     hdr.bitsperpixel = 24; // 24 bpp
     hdr.width = width;
     hdr.height = height;
-    
+
     fout = fopen(filename.c_str(), "wb");
     fwrite(&hdr, sizeof(TGAHeader), 1, fout);
     for (int i = 0; i < height; i++) {
@@ -41,4 +41,4 @@ void DumpTGA(std::string filename, int width, int height, u8* raw_data) {
     }
     fclose(fout);
 }
-} // namespace
\ No newline at end of file
+} // namespace
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 5f1933b1e3..cbd540bdf7 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -30,6 +30,7 @@ void Start() {
 
 /// Initialize the video core
 void Init(EmuWindow* emu_window) {
+    // Known problem with GLEW prevents contexts above 2.x on OSX unless glewExperimental is enabled.
     glewExperimental = GL_TRUE;
 
     g_emu_window = emu_window;