[Gzz-commits] libvob/src/os Os-GLX.cxx

[Tuukka Hastrup]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuukka Hastrup <address@hidden> 03/08/13 09:09:56

Modified files:
        src/os         : Os-GLX.cxx 

Log message:
        use glXMakeCurrent instead of glXMakeContextCurrent -> works with ATI

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/os/Os-GLX.cxx.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: libvob/src/os/Os-GLX.cxx
diff -u libvob/src/os/Os-GLX.cxx:1.12 libvob/src/os/Os-GLX.cxx:1.13
--- libvob/src/os/Os-GLX.cxx:1.12       Mon Aug 11 18:26:09 2003
+++ libvob/src/os/Os-GLX.cxx    Wed Aug 13 09:09:56 2003
@@ -342,14 +342,14 @@
 
        bool setCurrent() {
            DBG(dbg) << "setcurrent pixmap "<<pix<<" "<<ws->pxContext<<"\n";
-           bool ret = glXMakeContextCurrent(ws->dpy, pix, pix, ws->pxContext);
+           bool ret = glXMakeCurrent(ws->dpy, pix, ws->pxContext);
            DBG(dbg) << "setcurrent pixmap ret: "<<ret<<"\n";
            if(!ret) throw "Can't draw into pixmap";
            return ret;
        }
        bool releaseCurrent() {
            DBG(dbg) << "Releasecurrent pixmap "<<pix<<" "<<ws->pxContext<<"\n";
-           bool ret = glXMakeContextCurrent(ws->dpy, None, None, NULL);
+           bool ret = glXMakeCurrent(ws->dpy, None, NULL);
            DBG(dbg) << "Releasecurrent pixmap ret: "<<ret<<"\n";
            if(!ret)throw "Can't draw into pixmap";
            return ret;
@@ -391,16 +391,14 @@
 
        bool setCurrent() {
            DBG(dbg) << "setcurrent pbuf "<<pbuf<<" "<<ws->pbContext<<"\n";
-           bool ret = glXMakeContextCurrent(ws->dpy, pbuf, pbuf, 
ws->pbContext);
-            if(!ret)
-                XSync(ws->dpy, False);
+           bool ret = glXMakeCurrent(ws->dpy, pbuf, ws->pbContext);
            DBG(dbg) << "setcurrent pbuf ret: "<<ret<<"\n";
            if(!ret) throw "Can't draw into pbuf";
            return ret;
        }
        bool releaseCurrent() {
            DBG(dbg) << "Releasecurrent pbuf "<<pbuf<<" "<<ws->pbContext<<"\n";
-           bool ret = glXMakeContextCurrent(ws->dpy, None, None, NULL);
+           bool ret = glXMakeCurrent(ws->dpy, None, NULL);
            DBG(dbg) << "Releasecurrent pbuf ret: "<<ret<<"\n";
            if(!ret) throw "Can't draw into pbuf";
            return ret;