r8669 - in /trunk/libopengl-perl: OpenGL.pm OpenGL.xs gl_const.h gl_util.c gl_util.h glu_const.h isosurf.pl
ntyni-guest at users.alioth.debian.org
ntyni-guest at users.alioth.debian.org
Mon Oct 29 19:44:10 UTC 2007
Author: ntyni-guest
Date: Mon Oct 29 19:44:10 2007
New Revision: 8669
URL: http://svn.debian.org/wsvn/?sc=1&rev=8669
Log:
undo the .alan1 patches
Modified:
trunk/libopengl-perl/OpenGL.pm
trunk/libopengl-perl/OpenGL.xs
trunk/libopengl-perl/gl_const.h
trunk/libopengl-perl/gl_util.c
trunk/libopengl-perl/gl_util.h
trunk/libopengl-perl/glu_const.h
trunk/libopengl-perl/isosurf.pl
Modified: trunk/libopengl-perl/OpenGL.pm
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/OpenGL.pm?rev=8669&op=diff
==============================================================================
--- trunk/libopengl-perl/OpenGL.pm (original)
+++ trunk/libopengl-perl/OpenGL.pm Mon Oct 29 19:44:10 2007
@@ -105,40 +105,6 @@
@gl_func = qw(
glAccum
-glActiveTextureARB
-glClientActiveTextureARB
-glMultiTexCoord1dARB
-glMultiTexCoord1dvARB_c
-glMultiTexCoord1fARB
-glMultiTexCoord1fvARB_c
-glMultiTexCoord1iARB
-glMultiTexCoord1ivARB_c
-glMultiTexCoord1sARB
-glMultiTexCoord1svARB_c
-glMultiTexCoord2dARB
-glMultiTexCoord2dvARB_c
-glMultiTexCoord2fARB
-glMultiTexCoord2fvARB_c
-glMultiTexCoord2iARB
-glMultiTexCoord2ivARB_c
-glMultiTexCoord2sARB
-glMultiTexCoord2svARB_c
-glMultiTexCoord3dARB
-glMultiTexCoord3dvARB_c
-glMultiTexCoord3fARB
-glMultiTexCoord3fvARB_c
-glMultiTexCoord3iARB
-glMultiTexCoord3ivARB_c
-glMultiTexCoord3sARB
-glMultiTexCoord3svARB_c
-glMultiTexCoord4dARB
-glMultiTexCoord4dvARB_c
-glMultiTexCoord4fARB
-glMultiTexCoord4fvARB_c
-glMultiTexCoord4iARB
-glMultiTexCoord4ivARB_c
-glMultiTexCoord4sARB
-glMultiTexCoord4svARB_c
glAlphaFunc
glAreTexturesResident_s
glAreTexturesResident_c
@@ -381,7 +347,6 @@
glMaterialfv_c
glMaterialiv_c
glMatrixMode
-glMultiTexCoord2fARB
glMultMatrixd_p
glMultMatrixf_p
glNewList
@@ -1338,41 +1303,6 @@
GL_MODELVIEW
GL_PROJECTION
GL_TEXTURE
-GL_TEXTURE0_ARB
-GL_TEXTURE1_ARB
-GL_TEXTURE2_ARB
-GL_TEXTURE3_ARB
-GL_TEXTURE4_ARB
-GL_TEXTURE5_ARB
-GL_TEXTURE6_ARB
-GL_TEXTURE7_ARB
-GL_TEXTURE8_ARB
-GL_TEXTURE9_ARB
-GL_TEXTURE10_ARB
-GL_TEXTURE11_ARB
-GL_TEXTURE12_ARB
-GL_TEXTURE13_ARB
-GL_TEXTURE14_ARB
-GL_TEXTURE15_ARB
-GL_TEXTURE16_ARB
-GL_TEXTURE17_ARB
-GL_TEXTURE18_ARB
-GL_TEXTURE19_ARB
-GL_TEXTURE20_ARB
-GL_TEXTURE21_ARB
-GL_TEXTURE22_ARB
-GL_TEXTURE23_ARB
-GL_TEXTURE24_ARB
-GL_TEXTURE25_ARB
-GL_TEXTURE26_ARB
-GL_TEXTURE27_ARB
-GL_TEXTURE28_ARB
-GL_TEXTURE29_ARB
-GL_TEXTURE30_ARB
-GL_TEXTURE31_ARB
-GL_ACTIVE_TEXTURE_ARB
-GL_CLIENT_ACTIVE_TEXTURE_ARB
-GL_MAX_TEXTURE_UNITS_ARB
GL_POINT_SMOOTH
GL_POINT_SIZE
GL_POINT_SIZE_GRANULARITY
@@ -4220,49 +4150,6 @@
GL_CLIENT_VERTEX_ARRAY_BIT
GL_ALL_CLIENT_ATTRIB_BITS
GL_CLIENT_ALL_ATTRIB_BITS
-GL_DOT3_RGB_EXT
-GL_DOT3_RGBA_EXT
-GL_COMBINE_EXT
-GL_COMBINE_RGB_EXT
-GL_COMBINE_ALPHA_EXT
-GL_RGB_SCALE_EXT
-GL_ADD_SIGNED_EXT
-GL_INTERPOLATE_EXT
-GL_CONSTANT_EXT
-GL_PRIMARY_COLOR_EXT
-GL_PREVIOUS_EXT
-GL_SOURCE0_RGB_EXT
-GL_SOURCE1_RGB_EXT
-GL_SOURCE2_RGB_EXT
-GL_SOURCE3_RGB_EXT
-GL_SOURCE4_RGB_EXT
-GL_SOURCE5_RGB_EXT
-GL_SOURCE6_RGB_EXT
-GL_SOURCE7_RGB_EXT
-GL_SOURCE0_ALPHA_EXT
-GL_SOURCE1_ALPHA_EXT
-GL_SOURCE2_ALPHA_EXT
-GL_SOURCE3_ALPHA_EXT
-GL_SOURCE4_ALPHA_EXT
-GL_SOURCE5_ALPHA_EXT
-GL_SOURCE6_ALPHA_EXT
-GL_SOURCE7_ALPHA_EXT
-GL_OPERAND0_RGB_EXT
-GL_OPERAND1_RGB_EXT
-GL_OPERAND2_RGB_EXT
-GL_OPERAND3_RGB_EXT
-GL_OPERAND4_RGB_EXT
-GL_OPERAND5_RGB_EXT
-GL_OPERAND6_RGB_EXT
-GL_OPERAND7_RGB_EXT
-GL_OPERAND0_ALPHA_EXT
-GL_OPERAND1_ALPHA_EXT
-GL_OPERAND2_ALPHA_EXT
-GL_OPERAND3_ALPHA_EXT
-GL_OPERAND4_ALPHA_EXT
-GL_OPERAND5_ALPHA_EXT
-GL_OPERAND6_ALPHA_EXT
-GL_OPERAND7_ALPHA_EXT
GL_CG_VERTEX_SHADER_EXT
GL_CG_FRAGMENT_SHADER_EXT
GL_BUFFER_SIZE_ARB
Modified: trunk/libopengl-perl/OpenGL.xs
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/OpenGL.xs?rev=8669&op=diff
==============================================================================
--- trunk/libopengl-perl/OpenGL.xs (original)
+++ trunk/libopengl-perl/OpenGL.xs Mon Oct 29 19:44:10 2007
@@ -1373,6 +1373,8 @@
OUTPUT:
RETVAL
+
+
#ifdef HAVE_GL
# 1.0
@@ -5372,238 +5374,9 @@
free(ptr);
}
-#ifdef GL_ARB_multitexture
-
-# 1.2.1
-void
-glActiveTextureARB(texture)
- GLenum texture
-
-void
-glClientActiveTextureARB(texture)
- GLenum texture
-
-void
-glMultiTexCoord1dARB(target, s)
- GLenum target
- GLdouble s
-
-void
-glMultiTexCoord1dvARB_c(target, pointer)
- GLenum target
- void *pointer;
- CODE:
- glMultiTexCoord1dvARB(target, pointer);
-
-void
-glMultiTexCoord1fARB(target, s)
- GLenum target
- GLfloat s
-
-void
-glMultiTexCoord1fvARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord1fvARB(target, pointer);
-
-void
-glMultiTexCoord1iARB(target, s)
- GLenum target
- GLint s
-
-void
-glMultiTexCoord1ivARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord1ivARB(target, pointer);
-
-void
-glMultiTexCoord1sARB(target, s)
- GLenum target
- GLshort s
-
-void
-glMultiTexCoord1svARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord1svARB(target, pointer);
-
-void
-glMultiTexCoord2dARB(target, s, t);
- GLenum target
- GLdouble s
- GLdouble t
-
-void
-glMultiTexCoord2dvARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord2dvARB(target, pointer);
-
-void
-glMultiTexCoord2fARB(target, s, t)
- GLenum target
- GLfloat s
- GLfloat t
-
-void
-glMultiTexCoord2fvARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord2fvARB(target, pointer);
-
-void
-glMultiTexCoord2iARB(target, s, t)
- GLenum target
- GLint s
- GLint t
-
-void
-glMultiTexCoord2ivARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord2ivARB(target, pointer);
-
-void
-glMultiTexCoord2sARB(target, s, t)
- GLenum target
- GLshort s
- GLshort t
-
-void
-glMultiTexCoord2svARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord2svARB(target, pointer);
-
-void
-glMultiTexCoord3dARB(target, s, t, r)
- GLenum target
- GLdouble s
- GLdouble t
- GLdouble r
-
-void
-glMultiTexCoord3dvARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord2svARB(target, pointer);
-
-void
-glMultiTexCoord3fARB(target, s, t, r)
- GLenum target
- GLfloat s
- GLfloat t
- GLfloat r
-
-void
-glMultiTexCoord3fvARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord3fvARB(target, pointer);
-
-void
-glMultiTexCoord3iARB(target, s, t, r)
- GLenum target
- GLint s
- GLint t
- GLint r
-
-void
-glMultiTexCoord3ivARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord3ivARB(target, pointer);
-
-void
-glMultiTexCoord3sARB(target, s, t, r)
- GLenum target
- GLshort s
- GLshort t
- GLshort r
-
-void
-glMultiTexCoord3svARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord3svARB(target, pointer);
-
-void
-glMultiTexCoord4dARB(target, s, t, r, q)
- GLenum target
- GLdouble s
- GLdouble t
- GLdouble r
- GLdouble q;
-
-void
-glMultiTexCoord4dvARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord4dvARB(target, pointer);
-
-void
-glMultiTexCoord4fARB(target, s, t, r, q)
- GLenum target
- GLfloat s
- GLfloat t
- GLfloat r
- GLfloat q
-
-void
-glMultiTexCoord4fvARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord4fvARB(target, pointer);
-
-void
-glMultiTexCoord4iARB(target, s, t, r, q)
- GLenum target
- GLint s
- GLint t
- GLint r
- GLint q
-
-void
-glMultiTexCoord4ivARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord4ivARB(target, pointer);
-
-void
-glMultiTexCoord4sARB(target, s, t, r, q)
- GLenum target
- GLshort s
- GLshort t
- GLshort r
- GLshort q
-
-void
-glMultiTexCoord4svARB_c(target, pointer)
- GLenum target
- void *pointer
- CODE:
- glMultiTexCoord4svARB(target, pointer);
-
-#endif /* GL_ARB_multitexture */
-
-#endif /* GL_VERSION_1_2 */
-
-#endif /* GL_VERSION_1_1 */
+#endif
+
+#endif
# 1.0
void
Modified: trunk/libopengl-perl/gl_const.h
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/gl_const.h?rev=8669&op=diff
==============================================================================
--- trunk/libopengl-perl/gl_const.h (original)
+++ trunk/libopengl-perl/gl_const.h Mon Oct 29 19:44:10 2007
@@ -754,90 +754,6 @@
i(GL_MAX_TEXTURE_UNITS_ARB)
#endif
-#if defined(GL_ARB_multitexture)
- i(GL_TEXTURE0_ARB)
- i(GL_TEXTURE1_ARB)
- i(GL_TEXTURE2_ARB)
- i(GL_TEXTURE3_ARB)
- i(GL_TEXTURE4_ARB)
- i(GL_TEXTURE5_ARB)
- i(GL_TEXTURE6_ARB)
- i(GL_TEXTURE7_ARB)
- i(GL_TEXTURE8_ARB)
- i(GL_TEXTURE9_ARB)
- i(GL_TEXTURE10_ARB)
- i(GL_TEXTURE11_ARB)
- i(GL_TEXTURE12_ARB)
- i(GL_TEXTURE13_ARB)
- i(GL_TEXTURE14_ARB)
- i(GL_TEXTURE15_ARB)
- i(GL_TEXTURE16_ARB)
- i(GL_TEXTURE17_ARB)
- i(GL_TEXTURE18_ARB)
- i(GL_TEXTURE19_ARB)
- i(GL_TEXTURE20_ARB)
- i(GL_TEXTURE21_ARB)
- i(GL_TEXTURE22_ARB)
- i(GL_TEXTURE23_ARB)
- i(GL_TEXTURE24_ARB)
- i(GL_TEXTURE25_ARB)
- i(GL_TEXTURE26_ARB)
- i(GL_TEXTURE27_ARB)
- i(GL_TEXTURE28_ARB)
- i(GL_TEXTURE29_ARB)
- i(GL_TEXTURE30_ARB)
- i(GL_TEXTURE31_ARB)
-#endif
-
-#if defined(GL_EXT_texture_env_dot3)
- i(GL_DOT3_RGB_EXT)
- i(GL_DOT3_RGBA_EXT)
-#endif
-
-#if defined(GL_EXT_texture_env_combine)
- i(GL_COMBINE_EXT)
- i(GL_COMBINE_RGB_EXT)
- i(GL_COMBINE_ALPHA_EXT)
- i(GL_RGB_SCALE_EXT)
- i(GL_ADD_SIGNED_EXT)
- i(GL_INTERPOLATE_EXT)
- i(GL_CONSTANT_EXT)
- i(GL_PRIMARY_COLOR_EXT)
- i(GL_PREVIOUS_EXT)
- i(GL_SOURCE0_RGB_EXT)
- i(GL_SOURCE1_RGB_EXT)
- i(GL_SOURCE2_RGB_EXT)
- i(GL_SOURCE3_RGB_EXT)
- i(GL_SOURCE4_RGB_EXT)
- i(GL_SOURCE5_RGB_EXT)
- i(GL_SOURCE6_RGB_EXT)
- i(GL_SOURCE7_RGB_EXT)
- i(GL_SOURCE0_ALPHA_EXT)
- i(GL_SOURCE1_ALPHA_EXT)
- i(GL_SOURCE2_ALPHA_EXT)
- i(GL_SOURCE3_ALPHA_EXT)
- i(GL_SOURCE4_ALPHA_EXT)
- i(GL_SOURCE5_ALPHA_EXT)
- i(GL_SOURCE6_ALPHA_EXT)
- i(GL_SOURCE7_ALPHA_EXT)
- i(GL_OPERAND0_RGB_EXT)
- i(GL_OPERAND1_RGB_EXT)
- i(GL_OPERAND2_RGB_EXT)
- i(GL_OPERAND3_RGB_EXT)
- i(GL_OPERAND4_RGB_EXT)
- i(GL_OPERAND5_RGB_EXT)
- i(GL_OPERAND6_RGB_EXT)
- i(GL_OPERAND7_RGB_EXT)
- i(GL_OPERAND0_ALPHA_EXT)
- i(GL_OPERAND1_ALPHA_EXT)
- i(GL_OPERAND2_ALPHA_EXT)
- i(GL_OPERAND3_ALPHA_EXT)
- i(GL_OPERAND4_ALPHA_EXT)
- i(GL_OPERAND5_ALPHA_EXT)
- i(GL_OPERAND6_ALPHA_EXT)
- i(GL_OPERAND7_ALPHA_EXT)
-#endif
-
/* 2, see 37 */
/* 3 */
@@ -868,7 +784,7 @@
i(GL_INTENSITY8_EXT)
i(GL_INTENSITY12_EXT)
i(GL_INTENSITY16_EXT)
- //i(GL_R3_G3_B2_EXT)
+ i(GL_R3_G3_B2_EXT)
i(GL_RGB4_EXT)
i(GL_RGB5_EXT)
i(GL_RGB8_EXT)
@@ -962,9 +878,9 @@
#endif
/* 31 */
-//#ifdef GL_EXT_misc_attribute
-// i(GL_MISC_BIT_EXT)
-//#endif
+#ifdef GL_EXT_misc_attribute
+ i(GL_MISC_BIT_EXT)
+#endif
/* 37 & 2 */
#if defined(GL_EXT_blend_minmax) || defined(GL_EXT_blend_color)
@@ -1016,13 +932,13 @@
#if defined(GL_EXT_paletted_texture)
i(GL_TABLE_TOO_LARGE_EXT)
i(GL_COLOR_TABLE_FORMAT_EXT)
- i(GL_COLOR_TABLE_WIDTH_EXT)
- i(GL_COLOR_TABLE_RED_SIZE_EXT)
- i(GL_COLOR_TABLE_GREEN_SIZE_EXT)
- i(GL_COLOR_TABLE_BLUE_SIZE_EXT)
- i(GL_COLOR_TABLE_ALPHA_SIZE_EXT)
- i(GL_COLOR_TABLE_LUMINANCE_SIZE_EXT)
- i(GL_COLOR_TABLE_INTENSITY_SIZE_EXT)
+ i(GL_COLOR_TABLE_WIDTH_EXT)
+ i(GL_COLOR_TABLE_RED_SIZE_EXT)
+ i(GL_COLOR_TABLE_GREEN_SIZE_EXT)
+ i(GL_COLOR_TABLE_BLUE_SIZE_EXT)
+ i(GL_COLOR_TABLE_ALPHA_SIZE_EXT)
+ i(GL_COLOR_TABLE_LUMINANCE_SIZE_EXT)
+ i(GL_COLOR_TABLE_INTENSITY_SIZE_EXT)
i(GL_TEXTURE_INDEX_SIZE_EXT)
i(GL_COLOR_INDEX1_EXT)
i(GL_COLOR_INDEX2_EXT)
Modified: trunk/libopengl-perl/gl_util.c
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/gl_util.c?rev=8669&op=diff
==============================================================================
--- trunk/libopengl-perl/gl_util.c (original)
+++ trunk/libopengl-perl/gl_util.c Mon Oct 29 19:44:10 2007
@@ -719,10 +719,10 @@
/* 18 */
#ifdef GL_EXT_cmyka
-// case GL_CMYK:
-// n = 4; break;
-// case GL_CMYKA:
-// n = 5; break;
+ case GL_CMYK:
+ n = 4; break;
+ case GL_CMYKA:
+ n = 5; break;
#endif
#ifdef GL_EXT_agbr
Modified: trunk/libopengl-perl/gl_util.h
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/gl_util.h?rev=8669&op=diff
==============================================================================
--- trunk/libopengl-perl/gl_util.h (original)
+++ trunk/libopengl-perl/gl_util.h Mon Oct 29 19:44:10 2007
@@ -26,7 +26,6 @@
#else // No version-detection - use installed header files
#include <GL/gl.h>
-#include <GL/glext.h>
#endif
Modified: trunk/libopengl-perl/glu_const.h
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/glu_const.h?rev=8669&op=diff
==============================================================================
--- trunk/libopengl-perl/glu_const.h (original)
+++ trunk/libopengl-perl/glu_const.h Mon Oct 29 19:44:10 2007
@@ -79,6 +79,7 @@
i(GLU_INVALID_ENUM)
i(GLU_INVALID_VALUE)
i(GLU_OUT_OF_MEMORY)
+ i(GLU_INCOMPATIBLE_GL_VERSION)
#ifdef GLU_VESION_1_1
i(GLU_VERSION)
Modified: trunk/libopengl-perl/isosurf.pl
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/isosurf.pl?rev=8669&op=diff
==============================================================================
--- trunk/libopengl-perl/isosurf.pl (original)
+++ trunk/libopengl-perl/isosurf.pl Mon Oct 29 19:44:10 2007
@@ -2,7 +2,7 @@
use OpenGL qw(:all);
-$speed_test = GL_TRUE;
+$speed_test = GL_FALSE;
$use_vertex_arrays = GL_TRUE;
$doubleBuffer = GL_TRUE;
@@ -100,7 +100,7 @@
sub Draw {
if ($speed_test) {
- for ($xrot=0.0;$xrot<=3600.0;$xrot+=10.0) {
+ for ($xrot=0.0;$xrot<=360.0;$xrot+=10.0) {
draw1();
}
MyExit(0);
More information about the Pkg-perl-cvs-commits
mailing list