Kaydet (Commit) ee1b4eb7 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

even the baseline supports glx 1.3

We won't support glx < 1.3!!!!

Change-Id: Icc5d15d682223b1fab3165d279b596446c920e9b
üst 58e9647b
...@@ -835,7 +835,7 @@ bool DummyChart::initWindow() ...@@ -835,7 +835,7 @@ bool DummyChart::initWindow()
GLWin.screen = XScreenNumberOfScreen( xattr.screen ); GLWin.screen = XScreenNumberOfScreen( xattr.screen );
unx::XVisualInfo* vi( NULL ); unx::XVisualInfo* vi( NULL );
#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
unx::XVisualInfo* visinfo; unx::XVisualInfo* visinfo;
unx::XVisualInfo* firstVisual( NULL ); unx::XVisualInfo* firstVisual( NULL );
#endif #endif
...@@ -891,7 +891,7 @@ bool DummyChart::initWindow() ...@@ -891,7 +891,7 @@ bool DummyChart::initWindow()
const SystemEnvData* pChildSysData = NULL; const SystemEnvData* pChildSysData = NULL;
pWindow.reset(); pWindow.reset();
#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
unx::GLXFBConfig* fbconfigs = NULL; unx::GLXFBConfig* fbconfigs = NULL;
int nfbconfigs, value, i = 0; int nfbconfigs, value, i = 0;
#endif #endif
...@@ -903,7 +903,7 @@ bool DummyChart::initWindow() ...@@ -903,7 +903,7 @@ bool DummyChart::initWindow()
GLWin.screen, GLWin.screen,
*pAttributeTable ); *pAttributeTable );
#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
if( vi ) { if( vi ) {
if( !firstVisual ) if( !firstVisual )
firstVisual = vi; firstVisual = vi;
...@@ -970,7 +970,7 @@ bool DummyChart::initWindow() ...@@ -970,7 +970,7 @@ bool DummyChart::initWindow()
pWindow.reset(); pWindow.reset();
} }
} }
#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
} }
#endif #endif
...@@ -998,7 +998,7 @@ bool DummyChart::initWindow() ...@@ -998,7 +998,7 @@ bool DummyChart::initWindow()
#elif defined( UNX ) #elif defined( UNX )
GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay); GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay);
GLWin.win = pChildSysData->aWindow; GLWin.win = pChildSysData->aWindow;
#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap ) #if defined( GLX_EXT_texture_from_pixmap )
//TODO: moggi //TODO: moggi
/* /*
if( mbHasTFPVisual ) if( mbHasTFPVisual )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment