[GEM-cvs] Gem/src/Base GemWinCreateXWin.cpp,1.10.4.1,1.10.4.2
Brought to you by:
zmoelnig
From: IOhannes m z. <zmo...@us...> - 2005-02-07 13:59:14
|
Update of /cvsroot/pd-gem/Gem/src/Base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20537 Modified Files: Tag: multiple_window GemWinCreateXWin.cpp Log Message: catching errors that might get thrown by glx Index: GemWinCreateXWin.cpp =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Base/GemWinCreateXWin.cpp,v retrieving revision 1.10.4.1 retrieving revision 1.10.4.2 diff -C2 -d -r1.10.4.1 -r1.10.4.2 *** GemWinCreateXWin.cpp 7 Dec 2004 11:50:34 -0000 1.10.4.1 --- GemWinCreateXWin.cpp 7 Feb 2005 13:59:04 -0000 1.10.4.2 *************** *** 124,128 **** } // create the rendering context ! info.context = glXCreateContext(info.dpy, vi, hints.shared, GL_TRUE); if (info.context == NULL) { error("GEM: Could not create rendering context"); --- 124,132 ---- } // create the rendering context ! try { ! info.context = glXCreateContext(info.dpy, vi, hints.shared, GL_TRUE); ! } catch(void*e){ ! info.context=NULL; ! } if (info.context == NULL) { error("GEM: Could not create rendering context"); *************** *** 196,201 **** hints.title, "gem", None, 0, 0, NULL); ! glXMakeCurrent(info.dpy, info.win, info.context); ! if (!hints.actuallyDisplay) return(1); XMapRaised(info.dpy, info.win); --- 200,210 ---- hints.title, "gem", None, 0, 0, NULL); ! try{ ! glXMakeCurrent(info.dpy, info.win, info.context); ! }catch(void*e){ ! error("GEM: Could not make glX-context current"); ! destroyGemWindow(info); ! return(0); ! } if (!hints.actuallyDisplay) return(1); XMapRaised(info.dpy, info.win); |