[Gzz-commits] gzz/gfx Makefile libcallgl/Makefile libcallgl/c...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/09/23 14:08:46

Modified files:
        gfx            : Makefile 
        gfx/libcallgl  : Makefile callgl.cxx callgl.hxx 
        gfx/libos      : Os-GLX.cxx Os.hxx 
        gfx/librenderables: renderables.py 
Added files:
        gfx/libcallgl  : GL_kludge.cxx GL_kludge.hxx 

Log message:
        jvk's idea for compiling the source without NV - OpenGL kludge.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/Makefile.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/GL_kludge.cxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/GL_kludge.hxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/Makefile.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/callgl.cxx.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/callgl.hxx.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libos/Os-GLX.cxx.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libos/Os.hxx.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.60&tr2=1.61&r1=text&r2=text

Patches:
Index: gzz/gfx/Makefile
diff -c gzz/gfx/Makefile:1.9 gzz/gfx/Makefile:1.10
*** gzz/gfx/Makefile:1.9        Wed Sep  4 06:23:14 2002
--- gzz/gfx/Makefile    Mon Sep 23 14:08:46 2002
***************
*** 8,14 ****
  
  SUBDIRS=libutil libtexture libmosaic libtext libpaper libcolor librenderables 
libcallgl jni
  
! JNIOBJS=jni/GzzGL-jni.o jni/paper-jni.o libcallgl/callgl.o libcolor/spaces.o 
libmosaic/Mosaic.o libos/Os-GLX.o libpaper/Paper.o librenderables/Renderables.o 
libtext/Text.o libtexture/Texture.o libtexture/Texture_pipetexture.o 
libutil/buildmipmaps.o libutil/perlin.o libutil/Debug.o
  
  
  
--- 8,14 ----
  
  SUBDIRS=libutil libtexture libmosaic libtext libpaper libcolor librenderables 
libcallgl jni
  
! JNIOBJS=jni/GzzGL-jni.o jni/paper-jni.o libcallgl/callgl.o libcolor/spaces.o 
libmosaic/Mosaic.o libos/Os-GLX.o libpaper/Paper.o librenderables/Renderables.o 
libtext/Text.o libtexture/Texture.o libtexture/Texture_pipetexture.o 
libutil/buildmipmaps.o libutil/perlin.o libutil/Debug.o libcallgl/GL_kludge.o
  
  
  
Index: gzz/gfx/libcallgl/Makefile
diff -c gzz/gfx/libcallgl/Makefile:1.7 gzz/gfx/libcallgl/Makefile:1.8
*** gzz/gfx/libcallgl/Makefile:1.7      Wed Sep  4 13:39:30 2002
--- gzz/gfx/libcallgl/Makefile  Mon Sep 23 14:08:46 2002
***************
*** 1,19 ****
  include ../rules.mk
  
! sources = callgl.cxx calltest.cxx
  
! all: callgl.o 
  
  include $(sources:.cxx=.dep)
  
! CTOBJS=calltest.o callgl.o ../libutil/Debug.o
  
  calltest: $(CTOBJS)
        $(CXX) $(CTOBJS) -o calltest -lglut -lGL -lGLU
  
! callgl.cxx: gltokens.c
  
  # XXX Make it check whether the user has the nvidia include file...
  gltokens.c: Makefile /usr/include/GL/gl.h /usr/include/GL/glext.h
        grep -h '#define GL_\w\+[[:space:]]\+\w\+' /usr/include/GL/gl.h 
/usr/include/GL/glext.h $(NVIDIAH)/GL/gl.h | grep -v 'OFFSET_TEXTURE_2D_[BMS]' 
| cut -c12- | awk '{print "{\"" $$1 "\", " $$2 "},"}' | sort > gltokens.c
- 
--- 1,18 ----
  include ../rules.mk
  
! sources = callgl.cxx calltest.cxx GL_kludge.cxx
  
! all: callgl.o GL_kludge.o
  
  include $(sources:.cxx=.dep)
  
! CTOBJS=calltest.o callgl.o ../libutil/Debug.o GL_kludge.o
  
  calltest: $(CTOBJS)
        $(CXX) $(CTOBJS) -o calltest -lglut -lGL -lGLU
  
! callgl.cxx: gltokens.c 
  
  # XXX Make it check whether the user has the nvidia include file...
  gltokens.c: Makefile /usr/include/GL/gl.h /usr/include/GL/glext.h
        grep -h '#define GL_\w\+[[:space:]]\+\w\+' /usr/include/GL/gl.h 
/usr/include/GL/glext.h $(NVIDIAH)/GL/gl.h | grep -v 'OFFSET_TEXTURE_2D_[BMS]' 
| cut -c12- | awk '{print "{\"" $$1 "\", " $$2 "},"}' | sort > gltokens.c
Index: gzz/gfx/libcallgl/callgl.cxx
diff -c gzz/gfx/libcallgl/callgl.cxx:1.17 gzz/gfx/libcallgl/callgl.cxx:1.18
*** gzz/gfx/libcallgl/callgl.cxx:1.17   Mon Sep 23 03:43:42 2002
--- gzz/gfx/libcallgl/callgl.cxx        Mon Sep 23 14:08:46 2002
***************
*** 9,14 ****
--- 9,16 ----
  #include "callgl.hxx"
  #include <libutil/Debug.hxx>
  
+ #include "GL_kludge.hxx"
+ 
  #include <vector>
  using std::vector;
  
Index: gzz/gfx/libcallgl/callgl.hxx
diff -c gzz/gfx/libcallgl/callgl.hxx:1.17 gzz/gfx/libcallgl/callgl.hxx:1.18
*** gzz/gfx/libcallgl/callgl.hxx:1.17   Fri Sep 20 06:27:03 2002
--- gzz/gfx/libcallgl/callgl.hxx        Mon Sep 23 14:08:46 2002
***************
*** 227,233 ****
  
        void (* addr)() = list_address[func_name];
        if (addr == NULL) {
!         addr = Os::getExtendedProcAddress(func_name);
        list_address[func_name] = addr;
        }
        return addr;
--- 227,233 ----
  
        void (* addr)() = list_address[func_name];
        if (addr == NULL) {
!         addr = Os::getExtendedProcAddress(func_name.c_str());
        list_address[func_name] = addr;
        }
        return addr;
Index: gzz/gfx/libos/Os-GLX.cxx
diff -c gzz/gfx/libos/Os-GLX.cxx:1.11 gzz/gfx/libos/Os-GLX.cxx:1.12
*** gzz/gfx/libos/Os-GLX.cxx:1.11       Sat Sep 21 03:35:17 2002
--- gzz/gfx/libos/Os-GLX.cxx    Mon Sep 23 14:08:46 2002
***************
*** 530,537 ****
  
  
  
!     void (* getExtendedProcAddress(string s)) (void)  {
!         return glXGetProcAddressARB( (const GLubyte *) (s.c_str()) );
      }
  
  }
--- 530,537 ----
  
  
  
!     void (* getExtendedProcAddress(const char * c)) (void)  {
!         return glXGetProcAddressARB( (const GLubyte *)(c) );
      }
  
  }
Index: gzz/gfx/libos/Os.hxx
diff -c gzz/gfx/libos/Os.hxx:1.9 gzz/gfx/libos/Os.hxx:1.10
*** gzz/gfx/libos/Os.hxx:1.9    Sat Sep 21 03:35:17 2002
--- gzz/gfx/libos/Os.hxx        Mon Sep 23 14:08:46 2002
***************
*** 148,154 ****
       * @see <a href="CallGL.html">CallGl</a> 
       * @see <a href="http://oss.sgi.com/projects/ogl-sample/registry/";>OpenGL 
Extension Registry</a> 
       */
!     void (* getExtendedProcAddress(string s))(void);
  
  }
  
--- 148,154 ----
       * @see <a href="CallGL.html">CallGl</a> 
       * @see <a href="http://oss.sgi.com/projects/ogl-sample/registry/";>OpenGL 
Extension Registry</a> 
       */
!     void (* getExtendedProcAddress(const char * c))(void);
  
  }
  
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.60 
gzz/gfx/librenderables/renderables.py:1.61
*** gzz/gfx/librenderables/renderables.py:1.60  Mon Sep 23 04:37:04 2002
--- gzz/gfx/librenderables/renderables.py       Mon Sep 23 14:08:46 2002
***************
*** 785,791 ****
           */
          float texf = 0.5;
  
!         glActiveTexture(GL_TEXTURE1);
          glPushMatrix();
          AffineCoords cs2 = coords2;
          if (mode) {
--- 785,791 ----
           */
          float texf = 0.5;
  
!         glActiveTextureARB(GL_TEXTURE1_ARB);
          glPushMatrix();
          AffineCoords cs2 = coords2;
          if (mode) {
***************
*** 799,805 ****
          glTexGenfv(GL_S, GL_EYE_PLANE, svec);
          glTexGenfv(GL_T, GL_EYE_PLANE, tvec);
          glPopMatrix();
!         glActiveTexture(GL_TEXTURE0);
  
          for (unsigned i = 0; i < sizeof(sides)/sizeof(sides[0]); i++) {
              ZPt tex0 = cs2inv.transform(coords1.transform(lerp(texf, 
sides[i][3], sides[i][0])));
--- 799,805 ----
          glTexGenfv(GL_S, GL_EYE_PLANE, svec);
          glTexGenfv(GL_T, GL_EYE_PLANE, tvec);
          glPopMatrix();
!         glActiveTextureARB(GL_TEXTURE0_ARB);
  
          for (unsigned i = 0; i < sizeof(sides)/sizeof(sides[0]); i++) {
              ZPt tex0 = cs2inv.transform(coords1.transform(lerp(texf, 
sides[i][3], sides[i][0])));