[Gzz-commits] gzz/gfx/libcallgl callgl.cxx gltokens.c

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/11/01 08:05:02

Modified files:
        gfx/libcallgl  : callgl.cxx gltokens.c 

Log message:
        Fix CallGL::loadProgram and add GL_NV_fragment_program constants to 
gltokens.c

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/callgl.cxx.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/gltokens.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/gfx/libcallgl/callgl.cxx
diff -u gzz/gfx/libcallgl/callgl.cxx:1.30 gzz/gfx/libcallgl/callgl.cxx:1.31
--- gzz/gfx/libcallgl/callgl.cxx:1.30   Fri Nov  1 06:03:17 2002
+++ gzz/gfx/libcallgl/callgl.cxx        Fri Nov  1 08:05:01 2002
@@ -660,7 +660,7 @@
            return loadNVProg(GL_VERTEX_STATE_PROGRAM_NV, id, source);
 #endif
 #ifdef GL_FRAGMENT_PROGRAM_NV
-       else if (source.compare(0, 5, "!!FP") == 0)
+       else if (source.compare(0, 4, "!!FP") == 0)
            return loadNVProg(GL_FRAGMENT_PROGRAM_NV, id, source);
 #endif
 #ifdef GL_VERTEX_PROGRAM_ARB
Index: gzz/gfx/libcallgl/gltokens.c
diff -u gzz/gfx/libcallgl/gltokens.c:1.3 gzz/gfx/libcallgl/gltokens.c:1.4
--- gzz/gfx/libcallgl/gltokens.c:1.3    Sat Oct 12 10:59:54 2002
+++ gzz/gfx/libcallgl/gltokens.c        Fri Nov  1 08:05:01 2002
@@ -634,6 +634,8 @@
 {"FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX", 0x8409},
 {"FRAGMENT_MATERIAL_EXT", 0x8349},
 {"FRAGMENT_NORMAL_EXT", 0x834A},
+{"FRAGMENT_PROGRAM_BINDING_NV", 0x8873},
+{"FRAGMENT_PROGRAM_NV", 0x8870},
 {"FRAMEZOOM_FACTOR_SGIX", 0x818C},
 {"FRAMEZOOM_SGIX", 0x818B},
 {"FRONT", 0x0404},
@@ -968,6 +970,7 @@
 {"MAX_EXT", 0x8008},
 {"MAX_FOG_FUNC_POINTS_SGIS", 0x812C},
 {"MAX_FRAGMENT_LIGHTS_SGIX", 0x8404},
+{"MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV", 0x8868},
 {"MAX_FRAMEZOOM_FACTOR_SGIX", 0x818D},
 {"MAX_GENERAL_COMBINERS_NV", 0x854D},
 {"MAX_LIGHTS", 0x0D31},
@@ -983,6 +986,8 @@
 {"MAX_SHININESS_NV", 0x8504},
 {"MAX_SPOT_EXPONENT_NV", 0x8505},
 {"MAX_TEXTURES_SGIS", 0x835D},
+{"MAX_TEXTURE_COORDS_NV", 0x8871},
+{"MAX_TEXTURE_IMAGE_UNITS_NV", 0x8872},
 {"MAX_TEXTURE_LOD_BIAS_EXT", 0x84FD},
 {"MAX_TEXTURE_MAX_ANISOTROPY_EXT", 0x84FF},
 {"MAX_TEXTURE_SIZE", 0x0D33},
@@ -1107,6 +1112,7 @@
 {"NV_fence", 1},
 {"NV_flushHold", 1},
 {"NV_fog_distance", 1},
+{"NV_fragment_program", 1},
 {"NV_light_max_exponent", 1},
 {"NV_mac_get_proc_address", 1},
 {"NV_multisample_filter_hint", 1},
@@ -1351,6 +1357,7 @@
 {"PRIMARY_COLOR_EXT", 0x8577},
 {"PRIMARY_COLOR_NV", 0x852C},
 {"PROGRAM_ERROR_POSITION_NV", 0x864B},
+{"PROGRAM_ERROR_STRING_NV", 0x8874},
 {"PROGRAM_LENGTH_NV", 0x8627},
 {"PROGRAM_PARAMETER_NV", 0x8644},
 {"PROGRAM_RESIDENT_NV", 0x8647},