X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db4c39a9e87953142471077d6d26e509b2b05b6c..79b83ef08503bf1b546ad9df919ffd0ebf462cd7:/include/wx/gtk/glcanvas.h?ds=sidebyside diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h index f4c812ffa8..3eb5964fd8 100644 --- a/include/wx/gtk/glcanvas.h +++ b/include/wx/gtk/glcanvas.h @@ -12,10 +12,6 @@ #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "glcanvas.h" -#endif - #include "wx/scrolwin.h" #include "wx/app.h" @@ -25,30 +21,6 @@ extern "C" { #include } -//--------------------------------------------------------------------------- -// Constants for attriblist -//--------------------------------------------------------------------------- - -enum -{ - WX_GL_RGBA=1, /* use true color palette */ - WX_GL_BUFFER_SIZE, /* bits for buffer if not WX_GL_RGBA */ - WX_GL_LEVEL, /* 0 for main buffer, >0 for overlay, <0 for underlay */ - WX_GL_DOUBLEBUFFER, /* use doublebuffer */ - WX_GL_STEREO, /* use stereoscopic display */ - WX_GL_AUX_BUFFERS, /* number of auxiliary buffers */ - WX_GL_MIN_RED, /* use red buffer with most bits (> MIN_RED bits) */ - WX_GL_MIN_GREEN, /* use green buffer with most bits (> MIN_GREEN bits) */ - WX_GL_MIN_BLUE, /* use blue buffer with most bits (> MIN_BLUE bits) */ - WX_GL_MIN_ALPHA, /* use blue buffer with most bits (> MIN_ALPHA bits) */ - WX_GL_DEPTH_SIZE, /* bits for Z-buffer (0,16,32) */ - WX_GL_STENCIL_SIZE, /* bits for stencil buffer */ - WX_GL_MIN_ACCUM_RED, /* use red accum buffer with most bits (> MIN_ACCUM_RED bits) */ - WX_GL_MIN_ACCUM_GREEN, /* use green buffer with most bits (> MIN_ACCUM_GREEN bits) */ - WX_GL_MIN_ACCUM_BLUE, /* use blue buffer with most bits (> MIN_ACCUM_BLUE bits) */ - WX_GL_MIN_ACCUM_ALPHA /* use blue buffer with most bits (> MIN_ACCUM_ALPHA bits) */ -}; - //--------------------------------------------------------------------------- // classes //--------------------------------------------------------------------------- @@ -64,36 +36,19 @@ class WXDLLEXPORT wxGLCanvas; class WXDLLEXPORT wxGLContext: public wxObject { public: - wxGLContext( bool isRGB, wxWindow *win, const wxPalette& palette = wxNullPalette ); - wxGLContext( - bool WXUNUSED(isRGB), wxWindow *win, - const wxPalette& WXUNUSED(palette), - const wxGLContext *other /* for sharing display lists */ - ); - ~wxGLContext(); - - void SetCurrent(); - void SetColour(const wxChar *colour); - void SwapBuffers(); - - void SetupPixelFormat(); - void SetupPalette(const wxPalette& palette); - wxPalette CreateDefaultPalette(); - - inline wxPalette* GetPalette() const { return (wxPalette*) & m_palette; } - inline wxWindow* GetWindow() const { return m_window; } - inline GtkWidget* GetWidget() const { return m_widget; } - inline GLXContext GetContext() const { return m_glContext; } + wxGLContext(wxWindow* win, const wxGLContext* other=NULL /* for sharing display lists */); + virtual ~wxGLContext(); public: - GLXContext m_glContext; + // The win wxGLCanvas needs not necessarily be the same as the wxGLCanvas with which this context was created! + void SetCurrent(const wxGLCanvas& win) const; + - GtkWidget *m_widget; - wxPalette m_palette; - wxWindow* m_window; +private: + GLXContext m_glContext; private: - DECLARE_CLASS(wxGLContext) + DECLARE_CLASS(wxGLContext) }; //--------------------------------------------------------------------------- @@ -103,27 +58,32 @@ private: class WXDLLEXPORT wxGLCanvas: public wxWindow { public: - inline wxGLCanvas() { - m_glContext = (wxGLContext*) NULL; - m_sharedContext = (wxGLContext*) NULL; - m_glWidget = (GtkWidget*) NULL; - m_vi = (void*) NULL; - m_exposed = FALSE; - } + // This ctor is identical to the next, except for the fact that it + // doesn't create an implicit wxGLContext. + // The attribList parameter has been moved to avoid overload clashes. + wxGLCanvas( wxWindow *parent, wxWindowID id = -1, + int *attribList = (int*) NULL, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = wxGLCanvasName, + const wxPalette& palette = wxNullPalette ); + wxGLCanvas( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxGLCanvasName, int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL, + + wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxGLCanvasName, int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL, + + wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -142,8 +102,9 @@ public: int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - ~wxGLCanvas(); + virtual ~wxGLCanvas(); + void SetCurrent(const wxGLContext& RC) const; void SetCurrent(); void SetColour(const wxChar *colour); void SwapBuffers(); @@ -159,8 +120,11 @@ public: wxGLContext *m_glContext, *m_sharedContext; wxGLCanvas *m_sharedContextOf; + const bool m_createImplicitContext; void *m_vi; // actually an XVisualInfo* + GLXFBConfig *m_fbc; bool m_canFreeVi; + bool m_canFreeFBC; GtkWidget *m_glWidget; bool m_exposed; @@ -169,7 +133,13 @@ public: // caller is reponsible for using XFree() to deallocate // the returned structure. static void* ChooseGLVisual(int *attribList); + static void* ChooseGLFBC(int *attribList); + static void GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList ); + static void QueryGLXVersion(); + static int GetGLXVersion(); + static int m_glxVersion; + private: DECLARE_EVENT_TABLE() DECLARE_CLASS(wxGLCanvas)