ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up CInterfaceAGL, make sure the screen gets cleared on stop, and remove the FPS update that messes up GUI builds since GUIless doesn't build anyways.

This commit is contained in:
Braden 2013-03-18 17:15:59 -05:00
parent 7d74293170
commit a2af6494cf
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
View File

@ -31,12 +31,6 @@ void cInterfaceAGL::Swap()
[GLWin.cocoaCtx flushBuffer]; [GLWin.cocoaCtx flushBuffer];
} }
// Show the current FPS
void cInterfaceAGL::UpdateFPSDisplay(const char *text)
{
}
// Create rendering window. // Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
bool cInterfaceAGL::Create(void *&window_handle) bool cInterfaceAGL::Create(void *&window_handle)
@ -48,8 +42,6 @@ bool cInterfaceAGL::Create(void *&window_handle)
s_backbuffer_width = _twidth; s_backbuffer_width = _twidth;
s_backbuffer_height = _theight; s_backbuffer_height = _theight;
NSRect size;
NSUInteger style = NSMiniaturizableWindowMask;
NSOpenGLPixelFormatAttribute attr[] = { NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core, NSOpenGLPFAAccelerated, 0 }; NSOpenGLPixelFormatAttribute attr[] = { NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core, NSOpenGLPFAAccelerated, 0 };
NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc] NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc]
initWithAttributes: attr]; initWithAttributes: attr];
@ -66,14 +58,7 @@ bool cInterfaceAGL::Create(void *&window_handle)
return NULL; return NULL;
} }
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
size = [[NSScreen mainScreen] frame];
style |= NSBorderlessWindowMask;
} else {
size = NSMakeRect(_tx, _ty, _twidth, _theight);
style |= NSResizableWindowMask | NSTitledWindowMask;
}
GLWin.cocoaWin = (NSView*)(((wxPanel*)window_handle)->GetHandle());; GLWin.cocoaWin = (NSView*)(((wxPanel*)window_handle)->GetHandle());;
if (GLWin.cocoaWin == nil) { if (GLWin.cocoaWin == nil) {
ERROR_LOG(VIDEO, "failed to create window"); ERROR_LOG(VIDEO, "failed to create window");
@ -89,19 +74,8 @@ bool cInterfaceAGL::Create(void *&window_handle)
bool cInterfaceAGL::MakeCurrent() bool cInterfaceAGL::MakeCurrent()
{ {
int width, height;
width = [GLWin.cocoaWin frame].size.width;
height = [GLWin.cocoaWin frame].size.height;
//if (width == s_backbuffer_width && height == s_backbuffer_height)
// return true;
[GLWin.cocoaCtx setView: GLWin.cocoaWin];
[GLWin.cocoaCtx update];
[GLWin.cocoaCtx makeCurrentContext]; [GLWin.cocoaCtx makeCurrentContext];
s_backbuffer_width = width; return true;
s_backbuffer_height = height;
return true;
} }
// Close backend // Close backend
@ -109,6 +83,7 @@ void cInterfaceAGL::Shutdown()
{ {
[GLWin.cocoaCtx clearDrawable]; [GLWin.cocoaCtx clearDrawable];
[GLWin.cocoaCtx release]; [GLWin.cocoaCtx release];
GLWin.cocoaCtx = nil;
} }
void cInterfaceAGL::Update() void cInterfaceAGL::Update()

1
Source/Core/DolphinWX/Src/GLInterface/AGL.h
View File

@ -28,7 +28,6 @@ class cInterfaceAGL : public cInterfaceBase
{ {
public: public:
void Swap(); void Swap();
void UpdateFPSDisplay(const char *Text);
bool Create(void *&window_handle); bool Create(void *&window_handle);
bool MakeCurrent(); bool MakeCurrent();
void Shutdown(); void Shutdown();