yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate function for finding right GLXFBConfig.

Browse source 
svn path=/branches/work/kwin_composite/; revision=593458
This commit is contained in:
Luboš Luňák 2006-10-07 21:22:59 +00:00
parent 4a18e30518
commit 71b0978628
2 changed files with 46 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
scene_opengl.cpp
View file

@ -30,6 +30,13 @@ GLXFBConfig SceneOpenGL::fbcdrawable;
GLXContext SceneOpenGL::context;
GLXPixmap SceneOpenGL::glxroot;
static void checkGLError( const char* txt )
{
GLenum err = glGetError();
if( err != GL_NO_ERROR )
kWarning() << "GL error (" << txt << "): 0x" << QString::number( err, 16 ) << endl;
}
const int root_attrs[] =
{
GLX_DOUBLEBUFFER, False,
@ -42,7 +49,7 @@ const int root_attrs[] =
GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT | GLX_WINDOW_BIT,
None
};
const int drawable_attrs[] =
{
GLX_DOUBLEBUFFER, False,
@ -56,13 +63,6 @@ const int drawable_attrs[] =
None
};
static void checkGLError( const char* txt )
{
GLenum err = glGetError();
if( err != GL_NO_ERROR )
kWarning() << "GL error (" << txt << "): 0x" << QString::number( err, 16 ) << endl;
}
SceneOpenGL::SceneOpenGL( Workspace* ws )
: Scene( ws )
{
@ -75,14 +75,8 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
gcroot = XCreateGC( display(), rootWindow(), GCSubwindowMode, &gcattr );
buffer = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(),
QX11Info::appDepth());
GLXFBConfig* fbconfigs = glXChooseFBConfig( display(), DefaultScreen( display()),
root_attrs, &dummy );
fbcroot = fbconfigs[ 0 ];
XFree( fbconfigs );
fbconfigs = glXChooseFBConfig( display(), DefaultScreen( display()),
drawable_attrs, &dummy );
fbcdrawable = fbconfigs[ 0 ];
XFree( fbconfigs );
findConfig( root_attrs, fbcroot );
findConfig( drawable_attrs, fbcdrawable );
glxroot = glXCreatePixmap( display(), fbcroot, buffer, NULL );
context = glXCreateNewContext( display(), fbcroot, GLX_RGBA_TYPE, NULL, GL_FALSE );
glXMakeContextCurrent( display(), glxroot, glxroot, context );
@ -106,6 +100,41 @@ SceneOpenGL::~SceneOpenGL()
checkGLError( "Cleanup" );
}
bool SceneOpenGL::findConfig( const int* attrs, GLXFBConfig& config )
{
int cnt;
GLXFBConfig* fbconfigs = glXChooseFBConfig( display(), DefaultScreen( display()),
attrs, &cnt );
if( fbconfigs != NULL )
{
config = fbconfigs[ 0 ];
XFree( fbconfigs );
return true;
}
static const int empty[] = { None };
fbconfigs = glXChooseFBConfig( display(), DefaultScreen( display()), empty, &cnt );
for( int i = 0;
i < cnt;
++i )
{
int pos = 0;
kDebug() << "FBCONF:" << i << endl;
while( attrs[ pos ] != (int)None )
{
int value;
if( glXGetFBConfigAttrib( display(), fbconfigs[ i ], attrs[ pos ], &value )
== Success )
kDebug() << "ATTR:" << attrs[ pos ] << ":" << value
<< ":" << attrs[ pos + 1 ] << endl;
else
kDebug() << "ATTR FAIL:" << attrs[ pos ] << endl;
pos += 2;
}
}
assert( false );
return false;
}
static void quadDraw( int x, int y, int w, int h )
{
glTexCoord2i( x, y );

1
scene_opengl.h
View file

@ -32,6 +32,7 @@ class SceneOpenGL
virtual void windowAdded( Toplevel* );
virtual void windowDeleted( Toplevel* );
private:
bool findConfig( const int* attrs, GLXFBConfig& config );
typedef GLuint Texture;
GC gcroot;
Pixmap buffer;