瀏覽代碼

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.
archshift 12 年之前
父節點
當前提交
034e3aabc8
共有 4 個文件被更改,包括 6 次插入4 次删除
  1. 1 1
      src/citra_qt/bootmanager.cpp
  2. 1 0
      src/common/chunk_file.h
  3. 3 3
      src/video_core/utils.cpp
  4. 1 0
      src/video_core/video_core.cpp

+ 1 - 1
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);
     

+ 1 - 0
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:

+ 3 - 3
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
+} // namespace

+ 1 - 0
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;