Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In order to make shared wxGLContext work,\nadd new wxGLCanvas ctor passing a wxGLCanvas\n instead of a wxGLContext, to share context with.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Sylvain Bougnoux
2000-01-19 18:41:38 +00:00
parent 954e4e9883
commit b8167e73f6
2 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
utils/glcanvas/gtk/glcanvas.cpp
View File

@@ -149,7 +149,10 @@ wxPalette wxGLContext::CreateDefaultPalette()
static gint static gint
gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
{ {
win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, win->m_sharedContext ); wxGLContext *share= win->m_sharedContext;
if (share==NULL && win->m_sharedContextOf) share=win->m_sharedContextOf->GetContext();
win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, share );
return FALSE; return FALSE;
} }
@@ -242,7 +245,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id,
int *attribList, int *attribList,
const wxPalette& palette ) const wxPalette& palette )
{ {
Create( parent, NULL, id, pos, size, style, name, attribList, palette ); Create( parent, NULL, NULL, id, pos, size, style, name, attribList, palette );
} }
wxGLCanvas::wxGLCanvas( wxWindow *parent, wxGLCanvas::wxGLCanvas( wxWindow *parent,
@@ -253,11 +256,23 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
int *attribList, int *attribList,
const wxPalette& palette ) const wxPalette& palette )
{ {
Create( parent, shared, id, pos, size, style, name, attribList, palette ); Create( parent, shared, NULL, id, pos, size, style, name, attribList, palette );
}
wxGLCanvas::wxGLCanvas( wxWindow *parent,
const wxGLCanvas *shared,
wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style, const wxString& name,
int *attribList,
const wxPalette& palette )
{
Create( parent, NULL, shared, id, pos, size, style, name, attribList, palette );
} }
bool wxGLCanvas::Create( wxWindow *parent, bool wxGLCanvas::Create( wxWindow *parent,
const wxGLContext *shared, const wxGLContext *shared,
const wxGLCanvas *shared_context_of,
wxWindowID id, wxWindowID id,
const wxPoint& pos, const wxSize& size, const wxPoint& pos, const wxSize& size,
long style, const wxString& name, long style, const wxString& name,
@@ -265,6 +280,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
const wxPalette& palette) const wxPalette& palette)
{ {
m_sharedContext = (wxGLContext*)shared; // const_cast m_sharedContext = (wxGLContext*)shared; // const_cast
m_sharedContextOf = (wxGLCanvas*)shared_context_of; // const_cast
m_glContext = (wxGLContext*) NULL; m_glContext = (wxGLContext*) NULL;
m_exposed = FALSE; m_exposed = FALSE;
@@ -356,9 +372,7 @@ wxGLCanvas::~wxGLCanvas()
{ {
XVisualInfo *vi = (XVisualInfo *) m_vi; XVisualInfo *vi = (XVisualInfo *) m_vi;
if (vi) if (vi) XFree( vi );
XFree( vi );
if (m_glContext) delete m_glContext; if (m_glContext) delete m_glContext;
} }

27
utils/glcanvas/gtk/glcanvas.h
View File

@@ -94,6 +94,13 @@ private:
class wxGLCanvas: public wxScrolledWindow class wxGLCanvas: public wxScrolledWindow
{ {
public: public:
inline wxGLCanvas() {
m_glContext = (wxGLContext*) NULL;
m_sharedContext = (wxGLContext*) NULL;
m_glWidget = (GtkWidget*) NULL;
m_vi = (void*) NULL;
m_exposed = FALSE;
}
wxGLCanvas( wxWindow *parent, wxWindowID id = -1, wxGLCanvas( wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -107,16 +114,17 @@ public:
long style = 0, const wxString& name = "GLCanvas", long style = 0, const wxString& name = "GLCanvas",
int *attribList = (int*) NULL, int *attribList = (int*) NULL,
const wxPalette& palette = wxNullPalette ); const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL,
wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = "GLCanvas",
int *attribList = (int*) NULL,
const wxPalette& palette = wxNullPalette );
inline wxGLCanvas() { bool Create( wxWindow *parent,
m_glContext = (wxGLContext*) NULL; const wxGLContext *shared = (wxGLContext*)NULL,
m_sharedContext = (wxGLContext*) NULL; const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL,
m_glWidget = (GtkWidget*) NULL;
m_vi = (void*) NULL;
m_exposed = FALSE;
}
bool Create( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
wxWindowID id = -1, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -140,6 +148,7 @@ public:
wxGLContext *m_glContext, wxGLContext *m_glContext,
*m_sharedContext; *m_sharedContext;
wxGLCanvas *m_sharedContextOf;
void *m_vi; void *m_vi;
GtkWidget *m_glWidget; GtkWidget *m_glWidget;
bool m_exposed; bool m_exposed;