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

AGL: small style fixes

This commit is contained in:
Michael Maltese 2017-04-15 20:49:00 -07:00
parent 4770e66811
commit c63925dc21
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/GL/GLInterface/AGL.h
View File

@ -15,10 +15,6 @@ struct NSView;
class cInterfaceAGL : public cInterfaceBase
{
private:
NSView* cocoaWin;
NSOpenGLContext* cocoaCtx;
public:
void Swap() override;
bool Create(void* window_handle, bool core) override;
@ -27,4 +23,8 @@ public:
void Shutdown() override;
void Update() override;
void SwapInterval(int interval) override;
private:
NSView* m_view;
NSOpenGLContext* m_context;
};

26
Source/Core/Common/GL/GLInterface/AGL.mm
View File

@ -46,7 +46,7 @@ static bool AttachContextToView(NSOpenGLContext* context, NSView* view, u32* wid
void cInterfaceAGL::Swap()
{
[cocoaCtx flushBuffer];
[m_context flushBuffer];
}
// Create rendering window.
@ -64,9 +64,9 @@ bool cInterfaceAGL::Create(void* window_handle, bool core)
return false;
}
cocoaCtx = [[NSOpenGLContext alloc] initWithFormat:fmt shareContext:nil];
m_context = [[NSOpenGLContext alloc] initWithFormat:fmt shareContext:nil];
[fmt release];
if (cocoaCtx == nil)
if (m_context == nil)
{
ERROR_LOG(VIDEO, "failed to create context");
return false;
@ -75,13 +75,13 @@ bool cInterfaceAGL::Create(void* window_handle, bool core)
if (!window_handle)
return true;
cocoaWin = static_cast<NSView*>(window_handle);
return AttachContextToView(cocoaCtx, cocoaWin, &s_backbuffer_width, &s_backbuffer_height);
m_view = static_cast<NSView*>(window_handle);
return AttachContextToView(m_context, m_view, &s_backbuffer_width, &s_backbuffer_height);
}
bool cInterfaceAGL::MakeCurrent()
{
[cocoaCtx makeCurrentContext];
[m_context makeCurrentContext];
return true;
}
@ -94,21 +94,21 @@ bool cInterfaceAGL::ClearCurrent()
// Close backend
void cInterfaceAGL::Shutdown()
{
[cocoaCtx clearDrawable];
[cocoaCtx release];
cocoaCtx = nil;
[m_context clearDrawable];
[m_context release];
m_context = nil;
}
void cInterfaceAGL::Update()
{
if (!cocoaWin)
if (!m_view)
return;
if (UpdateCachedDimensions(cocoaWin, &s_backbuffer_width, &s_backbuffer_height))
[cocoaCtx update];
if (UpdateCachedDimensions(m_view, &s_backbuffer_width, &s_backbuffer_height))
[m_context update];
}
void cInterfaceAGL::SwapInterval(int interval)
{
[cocoaCtx setValues:(GLint*)&interval forParameter:NSOpenGLCPSwapInterval];
[m_context setValues:static_cast<GLint*>(&interval) forParameter:NSOpenGLCPSwapInterval];
}