wxGLCanvas *gc = (wxGLCanvas*) win;
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 );
- }
+ {
+ // 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 );
- }
+ {
+ // 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") );
}
wxGLCanvas *gc = (wxGLCanvas*) win;
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 );
- }
+ {
+ // 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 );
- }
+ {
+ // 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 )
{
if (m_glContext == glXGetCurrentContext())
{
- if (wxGLCanvas::GetGLXVersion() >= 13)
- // GLX >= 1.3
- glXMakeContextCurrent( GDK_DISPLAY(), None, None, NULL);
- else
- // GLX <= 1.2
- 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 );
if (m_glContext)
{
GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
-
- 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 );
+
+ 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 );
}
}
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") );
- }
+ {
+ // 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
{
- if (wxGLCanvas::GetGLXVersion() >= 13)
- // GLX >= 1.3
- vi = glXGetVisualFromFBConfig(GDK_DISPLAY(), m_fbc[0]);
- else
- // GLX <= 1.2
- 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 = gdkx_visual_get( vi->visualid );
- GdkColormap *colormap = gdk_colormap_new( visual, TRUE );
+ GdkVisual *visual;
+ GdkColormap *colormap;
+
+ // 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 );
+
+ m_glWidget = m_wxwindow;
+
+ GdkScreen *screen = gtk_widget_get_screen( m_glWidget );
+ colormap = gdk_screen_get_default_colormap(screen);
+ visual = gdk_colormap_get_visual(colormap);
+
+ if (GDK_VISUAL_XVISUAL(visual)->visualid != vi->visualid)
+ {
+ visual = gdk_x11_screen_lookup_visual( screen, vi->visualid );
+ colormap = gdk_colormap_new(visual, FALSE);
+ }
- gtk_widget_push_colormap( colormap );
- gtk_widget_push_visual( visual );
+ gtk_widget_set_colormap( m_glWidget, colormap );
+ }
+ else
+#endif
+ {
+ visual = gdkx_visual_get( vi->visualid );
+ colormap = gdk_colormap_new( visual, TRUE );
- 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 );
+ m_glWidget = m_wxwindow;
+ }
#ifdef __WXGTK20__
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_widget_pop_visual();
- gtk_widget_pop_colormap();
+#ifdef __WXGTK20__
+ if (gtk_check_version(2,2,0) != NULL)
+#endif
+ {
+ 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
wxGLCanvas::~wxGLCanvas()
{
- GLXFBConfig * fbc = (GLXFBConfig *) m_fbc;
- if (fbc && m_canFreeFBC) XFree( fbc );
+ GLXFBConfig * fbc = (GLXFBConfig *) m_fbc;
+ if (fbc && m_canFreeFBC)
+ XFree( fbc );
+
+ XVisualInfo *vi = (XVisualInfo *) m_vi;
+ if (vi && m_canFreeVi)
+ XFree( vi );
- XVisualInfo *vi = (XVisualInfo *) m_vi;
- if (vi && m_canFreeVi) XFree( vi );
-
delete m_glContext;
}
void* wxGLCanvas::ChooseGLVisual(int *attribList)
{
int data[512];
- GetGLAttribListFromWX( attribList, data );
- attribList = (int*) data;
-
- Display *dpy = GDK_DISPLAY();
+ GetGLAttribListFromWX( attribList, data );
+ attribList = (int*) data;
+
+ Display *dpy = GDK_DISPLAY();
- return glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
+ return glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
}
void* wxGLCanvas::ChooseGLFBC(int *attribList)
{
- int data[512];
- GetGLAttribListFromWX( attribList, data );
- attribList = (int*) data;
+ int data[512];
+ GetGLAttribListFromWX( attribList, data );
+ attribList = (int*) data;
- int returned;
- return glXChooseFBConfig( GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
- attribList, &returned );
+ int returned;
+ return glXChooseFBConfig( GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
+ attribList, &returned );
}
void wxGLCanvas::GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList )
{
- if (!wx_attribList)
+ if (!wx_attribList)
{
- 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;
- }
+ 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( (wx_attribList[arg]!=0) && (p<510) )
- {
- switch( wx_attribList[arg++] )
+ int arg=0, p=0;
+ while( (wx_attribList[arg]!=0) && (p<510) )
{
- 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;
+ 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;
+ }
}
- }
- gl_attribList[p] = 0;
+
+ gl_attribList[p] = 0;
}
}
void wxGLCanvas::QueryGLXVersion()
{
- if (m_glxVersion == 0)
+ 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;
+ // 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;
}
}
int wxGLCanvas::GetGLXVersion()
{
- wxASSERT_MSG( m_glxVersion>0, _T("GLX version has not been initialized with wxGLCanvas::QueryGLXVersion()") );
- return m_glxVersion;
+ wxASSERT_MSG( m_glxVersion>0, _T("GLX version has not been initialized with wxGLCanvas::QueryGLXVersion()") );
+ return m_glxVersion;
}
wxGLApp::~wxGLApp()
{
- if (m_glFBCInfo)
- XFree(m_glFBCInfo);
+ if (m_glFBCInfo)
+ XFree(m_glFBCInfo);
if (m_glVisualInfo)
XFree(m_glVisualInfo);
}
bool wxGLApp::InitGLVisual(int *attribList)
{
- wxGLCanvas::QueryGLXVersion();
+ wxGLCanvas::QueryGLXVersion();
- if (wxGLCanvas::GetGLXVersion() >= 13)
+ if (wxGLCanvas::GetGLXVersion() >= 13)
{
- // GLX >= 1.3
- if (m_glFBCInfo)
- XFree(m_glFBCInfo);
- m_glFBCInfo = wxGLCanvas::ChooseGLFBC(attribList);
-
- 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);
+ // GLX >= 1.3
+ if (m_glFBCInfo)
+ XFree(m_glFBCInfo);
+ m_glFBCInfo = wxGLCanvas::ChooseGLFBC(attribList);
+
+ 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
+ else
{
- // GLX <= 1.2
- if (m_glVisualInfo)
- XFree(m_glVisualInfo);
- m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList);
- return m_glVisualInfo != NULL;
+ // GLX <= 1.2
+ if (m_glVisualInfo)
+ XFree(m_glVisualInfo);
+ m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList);
+ return m_glVisualInfo != NULL;
}
}
#endif
// wxUSE_GLCANVAS
-
projects / wxWidgets.git / blobdiff