Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.135 diff -u -r1.135 ChangeLog --- xc/ChangeLog 27 Jul 2004 21:32:47 -0000 1.135 +++ xc/ChangeLog 27 Jul 2004 23:44:10 -0000 @@ -1,3 +1,8 @@ +2004-07-27 Roland Mainz + * xc/programs/glxinfo/glxinfo.c + Bugzilla #934: Fix glxinfo that it can be build against + Sun's version of GL. + 2004-07-27 Alexander Gottwald * config/cf/cygwin.cf: Index: xc/programs/glxinfo/glxinfo.c =================================================================== RCS file: /cvs/xorg/xc/programs/glxinfo/glxinfo.c,v retrieving revision 1.2 diff -u -r1.2 glxinfo.c --- xc/programs/glxinfo/glxinfo.c 23 Apr 2004 19:54:33 -0000 1.2 +++ xc/programs/glxinfo/glxinfo.c 27 Jul 2004 23:46:42 -0000 @@ -181,10 +181,14 @@ { 1, GL_MAX_TEXTURE_SIZE, "GL_MAX_TEXTURE_SIZE" }, { 1, GL_MAX_3D_TEXTURE_SIZE, "GL_MAX_3D_TEXTURE_SIZE" }, { 1, GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB" }, +#ifdef GL_MAX_RECTANGLE_TEXTURE_SIZE_NV { 1, GL_MAX_RECTANGLE_TEXTURE_SIZE_NV, "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV" }, +#endif /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */ { 1, GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB, "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB" }, { 1, GL_MAX_TEXTURE_UNITS_ARB, "GL_MAX_TEXTURE_UNITS_ARB" }, +#ifdef GL_MAX_TEXTURE_LOD_BIAS_EXT { 1, GL_MAX_TEXTURE_LOD_BIAS_EXT, "GL_MAX_TEXTURE_LOD_BIAS_EXT" }, +#endif /* GL_MAX_TEXTURE_LOD_BIAS_EXT */ { 1, GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT" }, { 2, GL_MAX_VIEWPORT_DIMS, "GL_MAX_VIEWPORT_DIMS" }, { 2, GL_ALIASED_LINE_WIDTH_RANGE, "GL_ALIASED_LINE_WIDTH_RANGE" },