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

Refactor all code common to X11 OpenGL implementations into glx11.h/.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-15 23:06:45 +00:00
parent e4e83f385a
commit 498ace9e1f
13 changed files with 711 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

311
src/gtk/glcanvas.cpp
View File

@@ -33,79 +33,6 @@ extern "C"
#include "wx/gtk/win_gtk.h"
#include "wx/gtk/private.h"
//---------------------------------------------------------------------------
// global data
//---------------------------------------------------------------------------
XVisualInfo *g_vi = (XVisualInfo*) NULL;
// ----------------------------------------------------------------------------
// helper functions
// ----------------------------------------------------------------------------
// wrapper around glXMakeContextCurrent/glXMakeCurrent depending on GLX
// version
static void wxMakeContextCurrent(GLXDrawable drawable, GLXContext context)
{
if (wxGLCanvas::GetGLXVersion() >= 13)
glXMakeContextCurrent( GDK_DISPLAY(), drawable, drawable, context);
else // GLX <= 1.2 doesn't have glXMakeContextCurrent()
glXMakeCurrent( GDK_DISPLAY(), drawable, context);
}
//---------------------------------------------------------------------------
// wxGLContext
//---------------------------------------------------------------------------
IMPLEMENT_CLASS(wxGLContext,wxObject)
wxGLContext::wxGLContext(wxWindow* win, const wxGLContext* other)
{
wxGLCanvas *gc = (wxGLCanvas*) win;
if (wxGLCanvas::GetGLXVersion() >= 13)
{
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 );
}
wxASSERT_MSG( m_glContext, _T("Couldn't create OpenGl context") );
}
wxGLContext::~wxGLContext()
{
if ( !m_glContext )
return;
if ( m_glContext == glXGetCurrentContext() )
wxMakeContextCurrent(None, NULL);
glXDestroyContext( GDK_DISPLAY(), m_glContext );
}
void wxGLContext::SetCurrent(const wxGLCanvas& win) const
{
if ( !m_glContext )
return;
GdkWindow *window = GTK_PIZZA(win.m_wxwindow)->bin_window;
wxCHECK_RET( window, _T("window must be shown") );
wxMakeContextCurrent(GDK_WINDOW_XWINDOW(window), m_glContext);
}
#if WXWIN_COMPATIBILITY_2_8
//-----------------------------------------------------------------------------
@@ -263,48 +190,12 @@ bool wxGLCanvas::Create(wxWindow *parent,
m_exposed = false;
m_noExpose = true;
m_nativeSizeEvent = true;
m_fbc = NULL;
m_vi = NULL;
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") );
}
if ( !InitVisual(attribList) )
return false;
XVisualInfo *vi = NULL;
if (wxTheApp->m_glVisualInfo != NULL)
{
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);
XVisualInfo * const xvi = GetXVisualInfo();
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;
@@ -320,9 +211,9 @@ bool wxGLCanvas::Create(wxWindow *parent,
colormap = gdk_screen_get_default_colormap(screen);
visual = gdk_colormap_get_visual(colormap);
if (GDK_VISUAL_XVISUAL(visual)->visualid != vi->visualid)
if (GDK_VISUAL_XVISUAL(visual)->visualid != xvi->visualid)
{
visual = gdk_x11_screen_lookup_visual( screen, vi->visualid );
visual = gdk_x11_screen_lookup_visual( screen, xvi->visualid );
colormap = gdk_colormap_new(visual, FALSE);
}
@@ -331,7 +222,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
else
#endif // GTK+ >= 2.2
{
visual = gdkx_visual_get( vi->visualid );
visual = gdkx_visual_get( xvi->visualid );
colormap = gdk_colormap_new( visual, TRUE );
gtk_widget_push_colormap( colormap );
@@ -368,167 +259,10 @@ bool wxGLCanvas::Create(wxWindow *parent,
return true;
}
wxGLCanvas::~wxGLCanvas()
{
GLXFBConfig * fbc = (GLXFBConfig *) m_fbc;
if (fbc && m_canFreeFBC)
XFree( fbc );
XVisualInfo *vi = (XVisualInfo *) m_vi;
if (vi && m_canFreeVi)
XFree( vi );
}
void* wxGLCanvas::ChooseGLVisual(const int *attribList)
{
int data[512];
GetGLAttribListFromWX( attribList, data );
Display *dpy = GDK_DISPLAY();
return glXChooseVisual( dpy, DefaultScreen(dpy), data );
}
void* wxGLCanvas::ChooseGLFBC(const int *attribList)
{
int data[512];
GetGLAttribListFromWX( attribList, data );
int returned;
return glXChooseFBConfig( GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
data, &returned );
}
void
wxGLCanvas::GetGLAttribListFromWX(const int *wx_attribList, int *gl_attribList)
{
if ( !wx_attribList )
{
if (wxGLCanvas::GetGLXVersion() >= 13)
{
// leave GLX >= 1.3 choose the default attributes
gl_attribList[0] = 0;
}
else // GLX < 1.3
{
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 // have non-default attributes
{
int arg=0, p=0;
while( (wx_attribList[arg]!=0) && (p<510) )
{
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:
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;
}
}
/* static */
int wxGLCanvas::GetGLXVersion()
{
static int s_glxVersion = 0;
if ( s_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)
s_glxVersion = 10; // 1.0 by default
else
s_glxVersion = glxMajorVer*10 + glxMinorVer;
}
return s_glxVersion;
}
void wxGLCanvas::SwapBuffers()
Window wxGLCanvas::GetXWindow() const
{
GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window;
glXSwapBuffers( GDK_DISPLAY(), GDK_WINDOW_XWINDOW( window ) );
return window ? GDK_WINDOW_XWINDOW(window) : 0;
}
void wxGLCanvas::OnInternalIdle()
@@ -562,33 +296,4 @@ void wxGLCanvas::GTKInitImplicitContext()
#endif // WXWIN_COMPATIBILITY_2_8
//---------------------------------------------------------------------------
// wxGLApp
//---------------------------------------------------------------------------
bool wxGLApp::InitGLVisual(const int *attribList)
{
if ( wxGLCanvas::GetGLXVersion() >= 13 )
{
if (m_glFBCInfo)
XFree(m_glFBCInfo);
m_glFBCInfo = wxGLCanvas::ChooseGLFBC(attribList);
if ( !m_glFBCInfo )
return false;
if (m_glVisualInfo)
XFree(m_glVisualInfo);
m_glVisualInfo = glXGetVisualFromFBConfig(GDK_DISPLAY(), ((GLXFBConfig *)m_glFBCInfo)[0]);
}
else // GLX <= 1.2
{
if (m_glVisualInfo)
XFree(m_glVisualInfo);
m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList);
}
return m_glVisualInfo != NULL;
}
#endif // wxUSE_GLCANVAS