Browse Source

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.
pull/15/merge
archshift 12 years ago
parent
commit
034e3aabc8
  1. 2
      src/citra_qt/bootmanager.cpp
  2. 1
      src/common/chunk_file.h
  3. 1
      src/video_core/video_core.cpp

2
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 // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose
QGLFormat fmt; QGLFormat fmt;
fmt.setProfile(QGLFormat::CoreProfile); fmt.setProfile(QGLFormat::CoreProfile);
fmt.setVersion(4,1);
fmt.setVersion(3,2);
fmt.setSampleBuffers(true); fmt.setSampleBuffers(true);
fmt.setSamples(4); fmt.setSamples(4);

1
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 /*class CChunkFileReader
{ {
public: public:

1
src/video_core/video_core.cpp

@ -30,6 +30,7 @@ void Start() {
/// Initialize the video core /// Initialize the video core
void Init(EmuWindow* emu_window) { void Init(EmuWindow* emu_window) {
// Known problem with GLEW prevents contexts above 2.x on OSX unless glewExperimental is enabled.
glewExperimental = GL_TRUE; glewExperimental = GL_TRUE;
g_emu_window = emu_window; g_emu_window = emu_window;

Loading…
Cancel
Save