[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx libmosaic/Mosaic.hxx libos/Os-GLX.cxx l...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz/gfx libmosaic/Mosaic.hxx libos/Os-GLX.cxx l... |
Date: |
Sat, 25 Jan 2003 07:12:53 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/01/25 07:12:51
Modified files:
gfx/libmosaic : Mosaic.hxx
gfx/libos : Os-GLX.cxx
gfx/libtext : Text.cxx Text.hxx
Log message:
Compilation fixed, dbg
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libmosaic/Mosaic.hxx.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libos/Os-GLX.cxx.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libtext/Text.cxx.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libtext/Text.hxx.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: gzz/gfx/libmosaic/Mosaic.hxx
diff -u gzz/gfx/libmosaic/Mosaic.hxx:1.13 gzz/gfx/libmosaic/Mosaic.hxx:1.14
--- gzz/gfx/libmosaic/Mosaic.hxx:1.13 Sat Jan 25 06:03:21 2003
+++ gzz/gfx/libmosaic/Mosaic.hxx Sat Jan 25 07:12:50 2003
@@ -26,6 +26,7 @@
#include <vector>
#include <iostream>
+#include <GL/gl.h>
#include <GL/glu.h>
#include <libutil/Debug.hxx>
Index: gzz/gfx/libos/Os-GLX.cxx
diff -u gzz/gfx/libos/Os-GLX.cxx:1.21 gzz/gfx/libos/Os-GLX.cxx:1.22
--- gzz/gfx/libos/Os-GLX.cxx:1.21 Sat Jan 18 09:53:08 2003
+++ gzz/gfx/libos/Os-GLX.cxx Sat Jan 25 07:12:51 2003
@@ -25,25 +25,27 @@
* or GNU/LinuX, whichever you prefer.
*/
-#include <GL/gl.h>
-#include <GL/glx.h>
-#include <X11/keysym.h>
-
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
#include <fcntl.h>
-#include <libos/Os.hxx>
-
-#include </usr/include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h>
-
#include <vector>
#include <map>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <X11/keysym.h>
+
+#include </usr/include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h>
+
+#include <libos/Os.hxx>
#include <libutil/Debug.hxx>
+
+
+
#define BARF(m) { cerr << m << "\n"; exit(18); }
@@ -362,11 +364,15 @@
}
bool setCurrent() {
+ DBG(dbg) << "setcurrent pixmap "<<pix<<" "<<ws->pxContext<<"\n";
bool ret = glXMakeContextCurrent(ws->dpy, pix, pix, ws->pxContext);
+ DBG(dbg) << "setcurrent pixmap ret: "<<ret<<"\n";
return ret;
}
bool releaseCurrent() {
+ DBG(dbg) << "Releasecurrent pixmap "<<pix<<" "<<ws->pxContext<<"\n";
bool ret = glXMakeContextCurrent(ws->dpy, None, None, NULL);
+ DBG(dbg) << "Releasecurrent pixmap ret: "<<ret<<"\n";
return ret;
}
@@ -411,11 +417,15 @@
}
bool setCurrent() {
+ DBG(dbg) << "setcurrent pbuf "<<pbuf<<" "<<ws->pbContext<<"\n";
bool ret = glXMakeContextCurrent(ws->dpy, pbuf, pbuf,
ws->pbContext);
+ DBG(dbg) << "setcurrent pbuf ret: "<<ret<<"\n";
return ret;
}
bool releaseCurrent() {
+ DBG(dbg) << "Releasecurrent pbuf "<<pbuf<<" "<<ws->pbContext<<"\n";
bool ret = glXMakeContextCurrent(ws->dpy, None, None, NULL);
+ DBG(dbg) << "Releasecurrent pbuf ret: "<<ret<<"\n";
return ret;
}
@@ -483,7 +493,7 @@
// GLERR
bool ret = glXMakeCurrent(ws->dpy, xw, ws->dbContext);
// GLERR
- DBG(dbg) << "setcurrent : "<<ret<<"\n";
+ DBG(dbg) << "setcurrent returned: "<<ret<<"\n";
return ret;
}
@@ -493,7 +503,7 @@
// GLERR
bool ret = glXMakeCurrent(ws->dpy, None, NULL);
// GLERR
- DBG(dbg) << "release : "<<ret<<"\n";
+ DBG(dbg) << "release returned: "<<ret<<"\n";
return ret;
}
Index: gzz/gfx/libtext/Text.cxx
diff -u gzz/gfx/libtext/Text.cxx:1.7 gzz/gfx/libtext/Text.cxx:1.8
--- gzz/gfx/libtext/Text.cxx:1.7 Tue Oct 8 03:30:12 2002
+++ gzz/gfx/libtext/Text.cxx Sat Jan 25 07:12:51 2003
@@ -72,5 +72,16 @@
return (face->size->metrics.ascender >> 6) * scale;
}
+ void normalBindTexture(const Mosaic::Id &t) {
+ t.bind(GL_TEXTURE_2D);
+ }
+
+ void normalBindTexture_01(const Mosaic::Id &t) {
+ glActiveTextureARB(GL_TEXTURE1);
+ t.bind();
+ glActiveTextureARB(GL_TEXTURE0);
+ t.bind();
+ }
+
}
Index: gzz/gfx/libtext/Text.hxx
diff -u gzz/gfx/libtext/Text.hxx:1.12 gzz/gfx/libtext/Text.hxx:1.13
--- gzz/gfx/libtext/Text.hxx:1.12 Sat Jan 25 06:03:21 2003
+++ gzz/gfx/libtext/Text.hxx Sat Jan 25 07:12:51 2003
@@ -247,17 +247,8 @@
}
};
- inline void normalBindTexture(const Mosaic::Id &t) {
- t.bind(GL_TEXTURE_2D);
- }
-
- inline void normalBindTexture_01(const Mosaic::Id &t) {
- glActiveTextureARB(GL_TEXTURE1);
- t.bind();
- glActiveTextureARB(GL_TEXTURE0);
- t.bind();
- }
-
+ void normalBindTexture(const Mosaic::Id &t) ;
+ void normalBindTexture_01(const Mosaic::Id &t) ;
template<class Glyphs, class Char> class Renderer {
Mosaic::Id curtex;
public:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gfx libmosaic/Mosaic.hxx libos/Os-GLX.cxx l...,
Tuomas J. Lukka <=