AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update mac gl, after rev 50900

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2007-12-24 00:05:24 +00:00
parent b02d434010
commit 50ccc908dc
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/mac/carbon/glcanvas.h
View File

@ -26,7 +26,7 @@ public:
wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
virtual ~wxGLContext();
virtual void SetCurrent(const wxGLCanvas& win) const;
virtual bool SetCurrent(const wxGLCanvas& win) const;
// Mac-specific
AGLContext GetAGLContext() const { return m_aglContext; }
@ -61,7 +61,7 @@ public:
virtual ~wxGLCanvas();
// implement wxGLCanvasBase methods
virtual void SwapBuffers();
virtual bool SwapBuffers();
// Mac-specific functions

16
src/mac/carbon/glcanvas.cpp
View File

@ -75,20 +75,27 @@ wxGLContext::~wxGLContext()
}
}
void wxGLContext::SetCurrent(const wxGLCanvas& win) const
bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
{
if ( !m_aglContext )
return;
return false;
AGLDrawable drawable = (AGLDrawable)GetWindowPort(
MAC_WXHWND(win.MacGetTopLevelWindowRef()));
if ( !aglSetDrawable(m_aglContext, drawable) )
{
wxLogAGLError("aglSetDrawable");
return false;
}
if ( !aglSetCurrentContext(m_aglContext) )
{
wxLogAGLError("aglSetCurrentContext");
return false;
}
wx_const_cast(wxGLCanvas&, win).SetViewport();
return true;
}
// ----------------------------------------------------------------------------
@ -305,12 +312,13 @@ wxGLCanvas::~wxGLCanvas()
aglDestroyPixelFormat(m_aglFormat);
}
void wxGLCanvas::SwapBuffers()
bool wxGLCanvas::SwapBuffers()
{
AGLContext context = aglGetCurrentContext();
wxCHECK_RET( context, _T("should have current context") );
wxCHECK_MSG(context, false, _T("should have current context"));
aglSwapBuffers(context);
return true;
}
void wxGLCanvas::SetViewport()