summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra_qt/bootmanager.cpp2
-rw-r--r--src/common/chunk_file.h1
-rw-r--r--src/video_core/utils.cpp6
-rw-r--r--src/video_core/video_core.cpp1
4 files changed, 6 insertions, 4 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index bd01b78c5..7089b9f97 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
104 // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose 104 // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose
105 QGLFormat fmt; 105 QGLFormat fmt;
106 fmt.setProfile(QGLFormat::CoreProfile); 106 fmt.setProfile(QGLFormat::CoreProfile);
107 fmt.setVersion(4,1); 107 fmt.setVersion(3,2);
108 fmt.setSampleBuffers(true); 108 fmt.setSampleBuffers(true);
109 fmt.setSamples(4); 109 fmt.setSamples(4);
110 110
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index c6a7cee35..8c9f839da 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -654,6 +654,7 @@ inline PointerWrapSection::~PointerWrapSection() {
654} 654}
655 655
656 656
657// Commented out because it is currently unused, and breaks builds on OSX
657/*class CChunkFileReader 658/*class CChunkFileReader
658{ 659{
659public: 660public:
diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp
index a90fc183b..b94376ac1 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) {
20 TGAHeader hdr; 20 TGAHeader hdr;
21 FILE* fout; 21 FILE* fout;
22 u8 r, g, b; 22 u8 r, g, b;
23 23
24 memset(&hdr, 0, sizeof(hdr)); 24 memset(&hdr, 0, sizeof(hdr));
25 hdr.datatypecode = 2; // uncompressed RGB 25 hdr.datatypecode = 2; // uncompressed RGB
26 hdr.bitsperpixel = 24; // 24 bpp 26 hdr.bitsperpixel = 24; // 24 bpp
27 hdr.width = width; 27 hdr.width = width;
28 hdr.height = height; 28 hdr.height = height;
29 29
30 fout = fopen(filename.c_str(), "wb"); 30 fout = fopen(filename.c_str(), "wb");
31 fwrite(&hdr, sizeof(TGAHeader), 1, fout); 31 fwrite(&hdr, sizeof(TGAHeader), 1, fout);
32 for (int i = 0; i < height; i++) { 32 for (int i = 0; i < height; i++) {
@@ -41,4 +41,4 @@ void DumpTGA(std::string filename, int width, int height, u8* raw_data) {
41 } 41 }
42 fclose(fout); 42 fclose(fout);
43} 43}
44} // namespace \ No newline at end of file 44} // namespace
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 5f1933b1e..cbd540bdf 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -30,6 +30,7 @@ void Start() {
30 30
31/// Initialize the video core 31/// Initialize the video core
32void Init(EmuWindow* emu_window) { 32void Init(EmuWindow* emu_window) {
33 // Known problem with GLEW prevents contexts above 2.x on OSX unless glewExperimental is enabled.
33 glewExperimental = GL_TRUE; 34 glewExperimental = GL_TRUE;
34 35
35 g_emu_window = emu_window; 36 g_emu_window = emu_window;