X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..63a3cd7a8c737eb4571f27e5f2af37eda0f1c5cc:/src/gtk/glcanvas.cpp?ds=sidebyside diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index 6299e9453a..7ce06c5f0b 100644 --- a/src/gtk/glcanvas.cpp +++ b/src/gtk/glcanvas.cpp @@ -1,23 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/glcanvas.cpp +// Name: src/gtk/glcanvas.cpp // Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK // Author: Robert Roebling // Modified by: // Created: 17/08/98 // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "glcanvas.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if wxUSE_GLCANVAS #include "wx/glcanvas.h" @@ -40,12 +34,17 @@ extern "C" #include "wx/build.h" WX_CHECK_BUILD_OPTIONS("wxGL") + +//--------------------------------------------------------------------------- +// static variables +//--------------------------------------------------------------------------- +int wxGLCanvas::m_glxVersion = 0; + //--------------------------------------------------------------------------- // global data //--------------------------------------------------------------------------- XVisualInfo *g_vi = (XVisualInfo*) NULL; - //----------------------------------------------------------------------------- // idle system //----------------------------------------------------------------------------- @@ -65,11 +64,21 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& m_widget = win->m_wxwindow; wxGLCanvas *gc = (wxGLCanvas*) win; - XVisualInfo *vi = (XVisualInfo *) gc->m_vi; - - wxCHECK_RET( vi, _T("invalid visual for OpenGl") ); - m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE ); + if (wxGLCanvas::GetGLXVersion() >= 13) + { + // GLX >= 1.3 + GLXFBConfig *fbc = gc->m_fbc; + wxCHECK_RET( fbc, _T("invalid GLXFBConfig for OpenGl") ); + m_glContext = glXCreateNewContext( GDK_DISPLAY(), fbc[0], GLX_RGBA_TYPE, None, GL_TRUE ); + } + else + { + // GLX <= 1.2 + XVisualInfo *vi = (XVisualInfo *) gc->m_vi; + wxCHECK_RET( vi, _T("invalid visual for OpenGl") ); + m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE ); + } wxCHECK_RET( m_glContext, _T("Couldn't create OpenGl context") ); } @@ -84,13 +93,25 @@ wxGLContext::wxGLContext( m_widget = win->m_wxwindow; wxGLCanvas *gc = (wxGLCanvas*) win; - XVisualInfo *vi = (XVisualInfo *) gc->m_vi; - - wxCHECK_RET( vi, _T("invalid visual for OpenGl") ); - m_glContext = glXCreateContext( GDK_DISPLAY(), vi, - other ? other->m_glContext : None, - GL_TRUE ); + if (wxGLCanvas::GetGLXVersion() >= 13) + { + // GLX >= 1.3 + GLXFBConfig *fbc = gc->m_fbc; + wxCHECK_RET( fbc, _T("invalid GLXFBConfig for OpenGl") ); + m_glContext = glXCreateNewContext( GDK_DISPLAY(), fbc[0], GLX_RGBA_TYPE, + other ? other->m_glContext : None, + GL_TRUE ); + } + else + { + // GLX <= 1.2 + XVisualInfo *vi = (XVisualInfo *) gc->m_vi; + wxCHECK_RET( vi, _T("invalid visual for OpenGl") ); + m_glContext = glXCreateContext( GDK_DISPLAY(), vi, + other ? other->m_glContext : None, + GL_TRUE ); + } if ( !m_glContext ) { @@ -104,7 +125,12 @@ wxGLContext::~wxGLContext() if (m_glContext == glXGetCurrentContext()) { - glXMakeCurrent( GDK_DISPLAY(), None, NULL); + if (wxGLCanvas::GetGLXVersion() >= 13) + // GLX >= 1.3 + glXMakeContextCurrent( GDK_DISPLAY(), None, None, NULL); + else + // GLX <= 1.2 + glXMakeCurrent( GDK_DISPLAY(), None, NULL); } glXDestroyContext( GDK_DISPLAY(), m_glContext ); @@ -124,7 +150,14 @@ void wxGLContext::SetCurrent() if (m_glContext) { GdkWindow *window = GTK_PIZZA(m_widget)->bin_window; - glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), m_glContext ); + + if (wxGLCanvas::GetGLXVersion() >= 13) + // GLX >= 1.3 + glXMakeContextCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), + GDK_WINDOW_XWINDOW(window), m_glContext ); + else + // GLX <= 1.2 + glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), m_glContext ); } } @@ -157,11 +190,10 @@ wxPalette wxGLContext::CreateDefaultPalette() // "realize" from m_wxwindow //----------------------------------------------------------------------------- +extern "C" { static gint -gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) +gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win ) { - // VZ: apparently in some cases we're called twice -- no idea why, - // but a check doesn't hurt if ( !win->m_glContext ) { wxGLContext *share = win->m_sharedContext; @@ -173,11 +205,13 @@ gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) return FALSE; } +} //----------------------------------------------------------------------------- // "map" from m_wxwindow //----------------------------------------------------------------------------- +extern "C" { static gint gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) { @@ -193,11 +227,13 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) return FALSE; } +} //----------------------------------------------------------------------------- // "expose_event" of m_wxwindow //----------------------------------------------------------------------------- +extern "C" { static void gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win ) { @@ -211,29 +247,13 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e gdk_event->area.width, gdk_event->area.height ); } - -//----------------------------------------------------------------------------- -// "draw" of m_wxwindow -//----------------------------------------------------------------------------- - -#ifndef __WXGTK20__ -static void -gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - win->m_exposed = TRUE; - - win->GetUpdateRegion().Union( rect->x, rect->y, - rect->width, rect->height ); } -#endif //----------------------------------------------------------------------------- // "size_allocate" of m_wxwindow //----------------------------------------------------------------------------- +extern "C" { static void gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxGLCanvas *win ) { @@ -247,6 +267,7 @@ gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, w event.SetEventObject( win ); win->GetEventHandler()->ProcessEvent( event ); } +} //--------------------------------------------------------------------------- // wxGlCanvas @@ -305,58 +326,113 @@ bool wxGLCanvas::Create( wxWindow *parent, m_exposed = FALSE; m_noExpose = TRUE; m_nativeSizeEvent = TRUE; + m_fbc = NULL; + m_vi = NULL; + + // to be sure the glx version is known + wxGLCanvas::QueryGLXVersion(); + + if (wxGLCanvas::GetGLXVersion() >= 13) + { + // GLX >= 1.3 uses a GLXFBConfig + GLXFBConfig * fbc = NULL; + if (wxTheApp->m_glFBCInfo != NULL) + { + fbc = (GLXFBConfig *) wxTheApp->m_glFBCInfo; + m_canFreeFBC = FALSE; // owned by wxTheApp - don't free upon destruction + } + else + { + fbc = (GLXFBConfig *) wxGLCanvas::ChooseGLFBC(attribList); + m_canFreeFBC = TRUE; + } + m_fbc = fbc; // save for later use + wxCHECK_MSG( m_fbc, FALSE, _T("required FBConfig couldn't be found") ); + } XVisualInfo *vi = NULL; if (wxTheApp->m_glVisualInfo != NULL) { - vi = (XVisualInfo *) wxTheApp->m_glVisualInfo; + vi = (XVisualInfo *)wxTheApp->m_glVisualInfo; m_canFreeVi = FALSE; // owned by wxTheApp - don't free upon destruction } else { - vi = (XVisualInfo *) ChooseGLVisual(attribList); + if (wxGLCanvas::GetGLXVersion() >= 13) + // GLX >= 1.3 + vi = glXGetVisualFromFBConfig(GDK_DISPLAY(), m_fbc[0]); + else + // GLX <= 1.2 + vi = (XVisualInfo *) ChooseGLVisual(attribList); + m_canFreeVi = TRUE; } + m_vi = vi; // save for later use wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") ); + GdkVisual *visual; + GdkColormap *colormap; - GdkVisual *visual = gdkx_visual_get( vi->visualid ); - GdkColormap *colormap = gdk_colormap_new( gdkx_visual_get(vi->visualid), TRUE ); + // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME) +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + { + wxWindow::Create( parent, id, pos, size, style, name ); - gtk_widget_push_colormap( colormap ); - gtk_widget_push_visual( visual ); + m_glWidget = m_wxwindow; - wxWindow::Create( parent, id, pos, size, style, name ); + GdkScreen *screen = gtk_widget_get_screen( m_glWidget ); + colormap = gdk_screen_get_default_colormap(screen); + visual = gdk_colormap_get_visual(colormap); - m_glWidget = m_wxwindow; + if (GDK_VISUAL_XVISUAL(visual)->visualid != vi->visualid) + { + visual = gdk_x11_screen_lookup_visual( screen, vi->visualid ); + colormap = gdk_colormap_new(visual, FALSE); + } -#ifdef __WXGTK20__ - gtk_widget_set_double_buffered( m_glWidget, FALSE ); + gtk_widget_set_colormap( m_glWidget, colormap ); + } + else #endif + { + visual = gdkx_visual_get( vi->visualid ); + colormap = gdk_colormap_new( visual, TRUE ); - gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE ); - - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize", - GTK_SIGNAL_FUNC(gtk_glwindow_realized_callback), (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "map", - GTK_SIGNAL_FUNC(gtk_glwindow_map_callback), (gpointer) this ); + gtk_widget_push_colormap( colormap ); + gtk_widget_push_visual( visual ); - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", - GTK_SIGNAL_FUNC(gtk_glwindow_expose_callback), (gpointer)this ); + wxWindow::Create( parent, id, pos, size, style, name ); + m_glWidget = m_wxwindow; + } -#ifndef __WXGTK20__ - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", - GTK_SIGNAL_FUNC(gtk_glwindow_draw_callback), (gpointer)this ); -#endif + gtk_widget_set_double_buffered( m_glWidget, FALSE ); - gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this ); + gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE ); - gtk_widget_pop_visual(); - gtk_widget_pop_colormap(); + g_signal_connect (m_wxwindow, "realize", + G_CALLBACK (gtk_glwindow_realized_callback), + this); + g_signal_connect (m_wxwindow, "map", + G_CALLBACK (gtk_glwindow_map_callback), + this); + g_signal_connect (m_wxwindow, "expose_event", + G_CALLBACK (gtk_glwindow_expose_callback), + this); + g_signal_connect (m_widget, "size_allocate", + G_CALLBACK (gtk_glcanvas_size_callback), + this); + + if (gtk_check_version(2,2,0) != NULL) + { + gtk_widget_pop_visual(); + gtk_widget_pop_colormap(); + } + // if our parent window is already visible, we had been realized before we + // connected to the "realize" signal and hence our m_glContext hasn't been + // initialized yet and we have to do it now if (GTK_WIDGET_REALIZED(m_wxwindow)) gtk_glwindow_realized_callback( m_wxwindow, this ); @@ -368,81 +444,169 @@ bool wxGLCanvas::Create( wxWindow *parent, wxGLCanvas::~wxGLCanvas() { + GLXFBConfig * fbc = (GLXFBConfig *) m_fbc; + if (fbc && m_canFreeFBC) + XFree( fbc ); + XVisualInfo *vi = (XVisualInfo *) m_vi; + if (vi && m_canFreeVi) + XFree( vi ); - if (vi && m_canFreeVi) XFree( vi ); delete m_glContext; } void* wxGLCanvas::ChooseGLVisual(int *attribList) { int data[512]; - if (!attribList) + GetGLAttribListFromWX( attribList, data ); + attribList = (int*) data; + + Display *dpy = GDK_DISPLAY(); + + return glXChooseVisual( dpy, DefaultScreen(dpy), attribList ); +} + +void* wxGLCanvas::ChooseGLFBC(int *attribList) +{ + int data[512]; + GetGLAttribListFromWX( attribList, data ); + attribList = (int*) data; + + int returned; + return glXChooseFBConfig( GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), + attribList, &returned ); +} + + +void wxGLCanvas::GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList ) +{ + if (!wx_attribList) { - // default settings if attriblist = 0 - data[0] = GLX_RGBA; - data[1] = GLX_DOUBLEBUFFER; - data[2] = GLX_DEPTH_SIZE; data[3] = 1; - data[4] = GLX_RED_SIZE; data[5] = 1; - data[6] = GLX_GREEN_SIZE; data[7] = 1; - data[8] = GLX_BLUE_SIZE; data[9] = 1; - data[10] = GLX_ALPHA_SIZE; data[11] = 0; - data[12] = None; - - attribList = (int*) data; + if (wxGLCanvas::GetGLXVersion() >= 13) + // leave GLX >= 1.3 choose the default attributes + gl_attribList[0] = 0; + else + { + int i = 0; + // default settings if attriblist = 0 + gl_attribList[i++] = GLX_RGBA; + gl_attribList[i++] = GLX_DOUBLEBUFFER; + gl_attribList[i++] = GLX_DEPTH_SIZE; gl_attribList[i++] = 1; + gl_attribList[i++] = GLX_RED_SIZE; gl_attribList[i++] = 1; + gl_attribList[i++] = GLX_GREEN_SIZE; gl_attribList[i++] = 1; + gl_attribList[i++] = GLX_BLUE_SIZE; gl_attribList[i++] = 1; + gl_attribList[i++] = GLX_ALPHA_SIZE; gl_attribList[i++] = 0; + gl_attribList[i++] = None; + } } else { - int arg=0, p=0; - - while( (attribList[arg]!=0) && (p<510) ) - { - switch( attribList[arg++] ) + int arg=0, p=0; + while( (wx_attribList[arg]!=0) && (p<510) ) { - case WX_GL_RGBA: data[p++] = GLX_RGBA; break; - case WX_GL_BUFFER_SIZE: - data[p++]=GLX_BUFFER_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_LEVEL: - data[p++]=GLX_LEVEL; data[p++]=attribList[arg++]; break; - case WX_GL_DOUBLEBUFFER: data[p++] = GLX_DOUBLEBUFFER; break; - case WX_GL_STEREO: data[p++] = GLX_STEREO; break; - case WX_GL_AUX_BUFFERS: - data[p++]=GLX_AUX_BUFFERS; data[p++]=attribList[arg++]; break; - case WX_GL_MIN_RED: - data[p++]=GLX_RED_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_MIN_GREEN: - data[p++]=GLX_GREEN_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_MIN_BLUE: - data[p++]=GLX_BLUE_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_MIN_ALPHA: - data[p++]=GLX_ALPHA_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_DEPTH_SIZE: - data[p++]=GLX_DEPTH_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_STENCIL_SIZE: - data[p++]=GLX_STENCIL_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_MIN_ACCUM_RED: - data[p++]=GLX_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_MIN_ACCUM_GREEN: - data[p++]=GLX_ACCUM_GREEN_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_MIN_ACCUM_BLUE: - data[p++]=GLX_ACCUM_BLUE_SIZE; data[p++]=attribList[arg++]; break; - case WX_GL_MIN_ACCUM_ALPHA: - data[p++]=GLX_ACCUM_ALPHA_SIZE; data[p++]=attribList[arg++]; break; - default: - break; + switch( wx_attribList[arg++] ) + { + case WX_GL_RGBA: + if (wxGLCanvas::GetGLXVersion() <= 12) + // for GLX >= 1.3, GLX_RGBA is useless (setting this flags will crash on most opengl implm) + gl_attribList[p++] = GLX_RGBA; + break; + case WX_GL_BUFFER_SIZE: + gl_attribList[p++] = GLX_BUFFER_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_LEVEL: + gl_attribList[p++] = GLX_LEVEL; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_DOUBLEBUFFER: + if (wxGLCanvas::GetGLXVersion() <= 12) + gl_attribList[p++] = GLX_DOUBLEBUFFER; + else + // for GLX >= 1.3, GLX_DOUBLEBUFFER format is different (1 <=> True) + // it seems this flag is useless for some hardware opengl implementation. + // but for Mesa 6.2.1, this flag is used so don't ignore it. + gl_attribList[p++] = GLX_DOUBLEBUFFER; + gl_attribList[p++] = 1; + break; + case WX_GL_STEREO: + gl_attribList[p++] = GLX_STEREO; + break; + case WX_GL_AUX_BUFFERS: + gl_attribList[p++] = GLX_AUX_BUFFERS; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_MIN_RED: + gl_attribList[p++] = GLX_RED_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_MIN_GREEN: + gl_attribList[p++] = GLX_GREEN_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_MIN_BLUE: + gl_attribList[p++] = GLX_BLUE_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_MIN_ALPHA: + gl_attribList[p++] = GLX_ALPHA_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_DEPTH_SIZE: + gl_attribList[p++] = GLX_DEPTH_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_STENCIL_SIZE: + gl_attribList[p++] = GLX_STENCIL_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_MIN_ACCUM_RED: + gl_attribList[p++] = GLX_ACCUM_RED_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_MIN_ACCUM_GREEN: + gl_attribList[p++] = GLX_ACCUM_GREEN_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_MIN_ACCUM_BLUE: + gl_attribList[p++] = GLX_ACCUM_BLUE_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + case WX_GL_MIN_ACCUM_ALPHA: + gl_attribList[p++] = GLX_ACCUM_ALPHA_SIZE; + gl_attribList[p++] = wx_attribList[arg++]; + break; + default: + break; + } } - } - data[p] = 0; - attribList = (int*) data; + gl_attribList[p] = 0; } +} +void wxGLCanvas::QueryGLXVersion() +{ + if (m_glxVersion == 0) + { + // check the GLX version + int glxMajorVer, glxMinorVer; + bool ok = glXQueryVersion(GDK_DISPLAY(), &glxMajorVer, &glxMinorVer); + wxASSERT_MSG( ok, _T("GLX version not found") ); + if (!ok) + m_glxVersion = 10; // 1.0 by default + else + m_glxVersion = glxMajorVer*10 + glxMinorVer; + } +} - Display *dpy = GDK_DISPLAY(); - - return glXChooseVisual( dpy, DefaultScreen(dpy), attribList ); +int wxGLCanvas::GetGLXVersion() +{ + wxASSERT_MSG( m_glxVersion>0, _T("GLX version has not been initialized with wxGLCanvas::QueryGLXVersion()") ); + return m_glxVersion; } + void wxGLCanvas::SwapBuffers() { if (m_glContext) @@ -490,20 +654,40 @@ IMPLEMENT_CLASS(wxGLApp, wxApp) wxGLApp::~wxGLApp() { + if (m_glFBCInfo) + XFree(m_glFBCInfo); if (m_glVisualInfo) XFree(m_glVisualInfo); } bool wxGLApp::InitGLVisual(int *attribList) { - if (m_glVisualInfo) - XFree(m_glVisualInfo); + wxGLCanvas::QueryGLXVersion(); - m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList); + if (wxGLCanvas::GetGLXVersion() >= 13) + { + // GLX >= 1.3 + if (m_glFBCInfo) + XFree(m_glFBCInfo); + m_glFBCInfo = wxGLCanvas::ChooseGLFBC(attribList); - return m_glVisualInfo != NULL; + if (m_glFBCInfo) + { + if (m_glVisualInfo) + XFree(m_glVisualInfo); + m_glVisualInfo = glXGetVisualFromFBConfig(GDK_DISPLAY(), ((GLXFBConfig *)m_glFBCInfo)[0]); + } + return (m_glFBCInfo != NULL) && (m_glVisualInfo != NULL); + } + else + { + // GLX <= 1.2 + if (m_glVisualInfo) + XFree(m_glVisualInfo); + m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList); + return m_glVisualInfo != NULL; + } } #endif // wxUSE_GLCANVAS -