From ca09631c7d00405ec7b8ad59117d103dec014712 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 1 Feb 2013 21:27:13 +0100 Subject: [PATCH] skip double variants, not float variants * figl/parse.scm (parse-prototypes): Skip double variants instead of skipping float variants, to better match hardware capabilities. * figl/gl/low-level.scm: * doc/low-level-gl.texi: Regenerate. --- doc/low-level-gl.texi | 84 +++++------ figl/gl/low-level.scm | 340 +++++++++++++++++++++--------------------- figl/parse.scm | 7 +- 3 files changed, 216 insertions(+), 215 deletions(-) diff --git a/doc/low-level-gl.texi b/doc/low-level-gl.texi index 0f15785..8f98507 100644 --- a/doc/low-level-gl.texi +++ b/doc/low-level-gl.texi @@ -2432,10 +2432,10 @@ execution of @code{glEnd}. @end deftypefun @deftypefun void glColor3i red green blue -@deftypefunx void glColor3d red green blue +@deftypefunx void glColor3f red green blue @deftypefunx void glColor3ui red green blue @deftypefunx void glColor4i red green blue alpha -@deftypefunx void glColor4d red green blue alpha +@deftypefunx void glColor4f red green blue alpha @deftypefunx void glColor4ui red green blue alpha Set the current color. @@ -6554,8 +6554,8 @@ the corresponding execution of @code{glEnd}. @end deftypefun -@deftypefun void glEvalCoord1d u -@deftypefunx void glEvalCoord2d u v +@deftypefun void glEvalCoord1f u +@deftypefunx void glEvalCoord2f u v Evaluate enabled one- and two-dimensional maps. @table @asis @@ -7036,7 +7036,7 @@ is used when @code{glDrawArrays}, @code{glMultiDrawArrays}, @end deftypefun -@deftypefun void glFogCoordd coord +@deftypefun void glFogCoordf coord Set the current fog coordinates. @table @asis @@ -9329,7 +9329,7 @@ value. @end deftypefun @deftypefun void glIndexi c -@deftypefunx void glIndexd c +@deftypefunx void glIndexf c @deftypefunx void glIndexub c Set the current color index. @@ -10338,7 +10338,7 @@ execution of @code{glEnd}. @end deftypefun -@deftypefun void glLoadMatrixd m +@deftypefun void glLoadMatrixf m Replace the current matrix with the specified matrix. @table @asis @@ -10406,7 +10406,7 @@ execution of @code{glEnd}. @end deftypefun -@deftypefun void glLoadTransposeMatrixd m +@deftypefun void glLoadTransposeMatrixf m Replace the current matrix with the specified row-major ordered matrix. @table @asis @@ -10544,7 +10544,7 @@ of @code{glEnd}. @end deftypefun -@deftypefun void glMap1d target u1 u2 stride order points +@deftypefun void glMap1f target u1 u2 stride order points Define a one-dimensional evaluator. @table @asis @@ -10708,7 +10708,7 @@ the value of @code{GL_ACTIVE_TEXTURE} is not @code{GL_TEXTURE0}. @end deftypefun -@deftypefun void glMap2d target u1 u2 ustride uorder v1 v2 vstride vorder points +@deftypefun void glMap2f target u1 u2 ustride uorder v1 v2 vstride vorder points Define a two-dimensional evaluator. @table @asis @@ -10993,8 +10993,8 @@ and the corresponding execution of @code{glEnd}. @end deftypefun -@deftypefun void glMapGrid1d un u1 u2 -@deftypefunx void glMapGrid2d un u1 u2 vn v1 v2 +@deftypefun void glMapGrid1f un u1 u2 +@deftypefunx void glMapGrid2f un u1 u2 vn v1 v2 Define a one- or two-dimensional mesh. @table @asis @@ -11400,13 +11400,13 @@ corresponding @code{glEnd}. @end deftypefun @deftypefun void glMultiTexCoord1i target s -@deftypefunx void glMultiTexCoord1d target s +@deftypefunx void glMultiTexCoord1f target s @deftypefunx void glMultiTexCoord2i target s t -@deftypefunx void glMultiTexCoord2d target s t +@deftypefunx void glMultiTexCoord2f target s t @deftypefunx void glMultiTexCoord3i target s t r -@deftypefunx void glMultiTexCoord3d target s t r +@deftypefunx void glMultiTexCoord3f target s t r @deftypefunx void glMultiTexCoord4i target s t r q -@deftypefunx void glMultiTexCoord4d target s t r q +@deftypefunx void glMultiTexCoord4f target s t r q Set the current texture coordinates. @table @asis @@ -11444,7 +11444,7 @@ values for @r{(@var{s},@var{t}@var{r}@var{q})} are @r{(0,001)}. @end deftypefun -@deftypefun void glMultMatrixd m +@deftypefun void glMultMatrixf m Multiply the current matrix with the specified matrix. @table @asis @@ -11467,7 +11467,7 @@ execution of @code{glEnd}. @end deftypefun -@deftypefun void glMultTransposeMatrixd m +@deftypefun void glMultTransposeMatrixf m Multiply the current matrix with the specified row-major ordered matrix. @table @asis @@ -11636,7 +11636,7 @@ value. @end deftypefun -@deftypefun void glNormal3d nx ny nz +@deftypefun void glNormal3f nx ny nz @deftypefunx void glNormal3i nx ny nz Set the current normal vector. @@ -13413,11 +13413,11 @@ corresponding call to @code{glEnd}. @end deftypefun @deftypefun void glRasterPos2i x y -@deftypefunx void glRasterPos2d x y +@deftypefunx void glRasterPos2f x y @deftypefunx void glRasterPos3i x y z -@deftypefunx void glRasterPos3d x y z +@deftypefunx void glRasterPos3f x y z @deftypefunx void glRasterPos4i x y z w -@deftypefunx void glRasterPos4d x y z w +@deftypefunx void glRasterPos4f x y z w Specify the raster position for pixel operations. @table @asis @@ -13798,7 +13798,7 @@ execution of @code{glEnd}. @end deftypefun -@deftypefun void glRectd x1 y1 x2 y2 +@deftypefun void glRectf x1 y1 x2 y2 @deftypefunx void glRecti x1 y1 x2 y2 Draw a rectangle. @@ -13958,7 +13958,7 @@ execution of @code{glEnd}. @end deftypefun -@deftypefun void glRotated angle x y z +@deftypefun void glRotatef angle x y z Multiply the current matrix by a rotation matrix. @table @asis @@ -14054,7 +14054,7 @@ execution of @code{glEnd}. @end deftypefun -@deftypefun void glScaled x y z +@deftypefun void glScalef x y z Multiply the current matrix by a general scaling matrix. @table @asis @@ -14193,7 +14193,7 @@ value. @end deftypefun @deftypefun void glSecondaryColor3i red green blue -@deftypefunx void glSecondaryColor3d red green blue +@deftypefunx void glSecondaryColor3f red green blue @deftypefunx void glSecondaryColor3ui red green blue Set the current secondary color. @@ -15167,13 +15167,13 @@ value. @end deftypefun @deftypefun void glTexCoord1i s -@deftypefunx void glTexCoord1d s +@deftypefunx void glTexCoord1f s @deftypefunx void glTexCoord2i s t -@deftypefunx void glTexCoord2d s t +@deftypefunx void glTexCoord2f s t @deftypefunx void glTexCoord3i s t r -@deftypefunx void glTexCoord3d s t r +@deftypefunx void glTexCoord3f s t r @deftypefunx void glTexCoord4i s t r q -@deftypefunx void glTexCoord4d s t r q +@deftypefunx void glTexCoord4f s t r q Set the current texture coordinates. @table @asis @@ -15629,7 +15629,7 @@ of @code{glEnd}. @end deftypefun @deftypefun void glTexGeni coord pname param -@deftypefunx void glTexGend coord pname param +@deftypefunx void glTexGenf coord pname param Control the generation of texture coordinates. @table @asis @@ -17510,7 +17510,7 @@ execution of @code{glEnd}. @end deftypefun -@deftypefun void glTranslated x y z +@deftypefun void glTranslatef x y z Multiply the current matrix by a translation matrix. @table @asis @@ -17923,14 +17923,14 @@ value. @end deftypefun -@deftypefun void glVertexAttrib1s index v0 -@deftypefunx void glVertexAttrib1d index v0 +@deftypefun void glVertexAttrib1f index v0 +@deftypefunx void glVertexAttrib1s index v0 +@deftypefunx void glVertexAttrib2f index v0 v1 @deftypefunx void glVertexAttrib2s index v0 v1 -@deftypefunx void glVertexAttrib2d index v0 v1 +@deftypefunx void glVertexAttrib3f index v0 v1 v2 @deftypefunx void glVertexAttrib3s index v0 v1 v2 -@deftypefunx void glVertexAttrib3d index v0 v1 v2 +@deftypefunx void glVertexAttrib4f index v0 v1 v2 v3 @deftypefunx void glVertexAttrib4s index v0 v1 v2 v3 -@deftypefunx void glVertexAttrib4d index v0 v1 v2 v3 @deftypefunx void glVertexAttrib4Nub index v0 v1 v2 v3 Specifies the value of a generic vertex attribute. @@ -18085,11 +18085,11 @@ value. @end deftypefun @deftypefun void glVertex2i x y -@deftypefunx void glVertex2d x y +@deftypefunx void glVertex2f x y @deftypefunx void glVertex3i x y z -@deftypefunx void glVertex3d x y z +@deftypefunx void glVertex3f x y z @deftypefunx void glVertex4i x y z w -@deftypefunx void glVertex4d x y z w +@deftypefunx void glVertex4f x y z w Specify a vertex. @table @asis @@ -18154,9 +18154,9 @@ execution of @code{glEnd}. @end deftypefun @deftypefun void glWindowPos2i x y -@deftypefunx void glWindowPos2d x y +@deftypefunx void glWindowPos2f x y @deftypefunx void glWindowPos3i x y z -@deftypefunx void glWindowPos3d x y z +@deftypefunx void glWindowPos3f x y z Specify the raster position in window coordinates for pixel operations. @table @asis diff --git a/figl/gl/low-level.scm b/figl/gl/low-level.scm index 8a9a17d..2bf5e86 100644 --- a/figl/gl/low-level.scm +++ b/figl/gl/low-level.scm @@ -84,10 +84,10 @@ glColorSubTable glColorTable glColor3i - glColor3d + glColor3f glColor3ui glColor4i - glColor4d + glColor4f glColor4ui glCompileShader glCompressedTexImage1D @@ -137,8 +137,8 @@ glDisableVertexAttribArray glEnable glDisable - glEvalCoord1d - glEvalCoord2d + glEvalCoord1f + glEvalCoord2f glEvalMesh1 glEvalMesh2 glEvalPoint1 @@ -147,7 +147,7 @@ glFinish glFlush glFogCoordPointer - glFogCoordd + glFogCoordf glFogf glFogi glFrontFace @@ -181,7 +181,7 @@ glIndexMask glIndexPointer glIndexi - glIndexd + glIndexf glIndexub glInitNames glInterleavedArrays @@ -201,16 +201,16 @@ glLinkProgram glListBase glLoadIdentity - glLoadMatrixd + glLoadMatrixf glLoadName - glLoadTransposeMatrixd + glLoadTransposeMatrixf glLogicOp - glMap1d - glMap2d + glMap1f + glMap2f glMapBuffer glUnmapBuffer - glMapGrid1d - glMapGrid2d + glMapGrid1f + glMapGrid2f glMaterialf glMateriali glMatrixMode @@ -218,19 +218,19 @@ glMultiDrawArrays glMultiDrawElements glMultiTexCoord1i - glMultiTexCoord1d + glMultiTexCoord1f glMultiTexCoord2i - glMultiTexCoord2d + glMultiTexCoord2f glMultiTexCoord3i - glMultiTexCoord3d + glMultiTexCoord3f glMultiTexCoord4i - glMultiTexCoord4d - glMultMatrixd - glMultTransposeMatrixd + glMultiTexCoord4f + glMultMatrixf + glMultTransposeMatrixf glNewList glEndList glNormalPointer - glNormal3d + glNormal3f glNormal3i glOrtho glPassThrough @@ -255,25 +255,25 @@ glPushName glPopName glRasterPos2i - glRasterPos2d + glRasterPos2f glRasterPos3i - glRasterPos3d + glRasterPos3f glRasterPos4i - glRasterPos4d + glRasterPos4f glReadBuffer glReadPixels - glRectd + glRectf glRecti glRenderMode glResetHistogram glResetMinmax - glRotated + glRotatef glSampleCoverage - glScaled + glScalef glScissor glSecondaryColorPointer glSecondaryColor3i - glSecondaryColor3d + glSecondaryColor3f glSecondaryColor3ui glSelectBuffer glSeparableFilter2D @@ -287,17 +287,17 @@ glStencilOp glTexCoordPointer glTexCoord1i - glTexCoord1d + glTexCoord1f glTexCoord2i - glTexCoord2d + glTexCoord2f glTexCoord3i - glTexCoord3d + glTexCoord3f glTexCoord4i - glTexCoord4d + glTexCoord4f glTexEnvf glTexEnvi glTexGeni - glTexGend + glTexGenf glTexImage1D glTexImage2D glTexImage3D @@ -306,7 +306,7 @@ glTexSubImage1D glTexSubImage2D glTexSubImage3D - glTranslated + glTranslatef glUniform1f glUniform2f glUniform3f @@ -318,27 +318,27 @@ glUseProgram glValidateProgram glVertexAttribPointer + glVertexAttrib1f glVertexAttrib1s - glVertexAttrib1d + glVertexAttrib2f glVertexAttrib2s - glVertexAttrib2d + glVertexAttrib3f glVertexAttrib3s - glVertexAttrib3d + glVertexAttrib4f glVertexAttrib4s - glVertexAttrib4d glVertexAttrib4Nub glVertexPointer glVertex2i - glVertex2d + glVertex2f glVertex3i - glVertex3d + glVertex3f glVertex4i - glVertex4d + glVertex4f glViewport glWindowPos2i - glWindowPos2d + glWindowPos2f glWindowPos3i - glWindowPos3d)) + glWindowPos3f)) (define-foreign-procedure ((glAccum (op GLenum) (value GLfloat) -> void)) @@ -2585,10 +2585,10 @@ between the execution of `glBegin' and the corresponding execution of (blue GLint) -> void) - (glColor3d - (red GLdouble) - (green GLdouble) - (blue GLdouble) + (glColor3f + (red GLfloat) + (green GLfloat) + (blue GLfloat) -> void) (glColor3ui @@ -2604,11 +2604,11 @@ between the execution of `glBegin' and the corresponding execution of (alpha GLint) -> void) - (glColor4d - (red GLdouble) - (green GLdouble) - (blue GLdouble) - (alpha GLdouble) + (glColor4f + (red GLfloat) + (green GLfloat) + (blue GLfloat) + (alpha GLfloat) -> void) (glColor4ui @@ -6591,8 +6591,8 @@ executed between the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glEvalCoord1d (u GLdouble) -> void) - (glEvalCoord2d (u GLdouble) (v GLdouble) -> void)) + ((glEvalCoord1f (u GLfloat) -> void) + (glEvalCoord2f (u GLfloat) (v GLfloat) -> void)) "Evaluate enabled one- and two-dimensional maps. U @@ -7042,7 +7042,7 @@ called. `GL_INVALID_VALUE' is generated if STRIDE is negative.") (define-foreign-procedure - ((glFogCoordd (coord GLdouble) -> void)) + ((glFogCoordf (coord GLfloat) -> void)) "Set the current fog coordinates. COORD @@ -9189,7 +9189,7 @@ enabled, the color index array is used when `glDrawArrays', (define-foreign-procedure ((glIndexi (c GLint) -> void) - (glIndexd (c GLdouble) -> void) + (glIndexf (c GLfloat) -> void) (glIndexub (c GLubyte) -> void)) "Set the current color index. @@ -10108,7 +10108,7 @@ between the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glLoadMatrixd (m *) -> void)) + ((glLoadMatrixf (m *) -> void)) "Replace the current matrix with the specified matrix. M @@ -10164,7 +10164,7 @@ name stack is empty. the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glLoadTransposeMatrixd (m *) -> void)) + ((glLoadTransposeMatrixf (m *) -> void)) "Replace the current matrix with the specified row-major ordered matrix. M @@ -10284,10 +10284,10 @@ source and destination indices or colors. the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glMap1d + ((glMap1f (target GLenum) - (u1 GLdouble) - (u2 GLdouble) + (u1 GLfloat) + (u2 GLfloat) (stride GLint) (order GLint) (points *) @@ -10445,14 +10445,14 @@ execution of `glBegin' and the corresponding execution of `glEnd'. of `GL_ACTIVE_TEXTURE' is not `GL_TEXTURE0'.") (define-foreign-procedure - ((glMap2d + ((glMap2f (target GLenum) - (u1 GLdouble) - (u2 GLdouble) + (u1 GLfloat) + (u2 GLfloat) (ustride GLint) (uorder GLint) - (v1 GLdouble) - (v2 GLdouble) + (v1 GLfloat) + (v2 GLfloat) (vstride GLint) (vorder GLint) (points *) @@ -10722,19 +10722,19 @@ is executed between the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glMapGrid1d + ((glMapGrid1f (un GLint) - (u1 GLdouble) - (u2 GLdouble) + (u1 GLfloat) + (u2 GLfloat) -> void) - (glMapGrid2d + (glMapGrid2f (un GLint) - (u1 GLdouble) - (u2 GLdouble) + (u1 GLfloat) + (u2 GLfloat) (vn GLint) - (v1 GLdouble) - (v2 GLdouble) + (v1 GLfloat) + (v2 GLfloat) -> void)) "Define a one- or two-dimensional mesh. @@ -11125,9 +11125,9 @@ between the execution of `glBegin' and the corresponding `glEnd'.") (s GLint) -> void) - (glMultiTexCoord1d + (glMultiTexCoord1f (target GLenum) - (s GLdouble) + (s GLfloat) -> void) (glMultiTexCoord2i @@ -11136,10 +11136,10 @@ between the execution of `glBegin' and the corresponding `glEnd'.") (t GLint) -> void) - (glMultiTexCoord2d + (glMultiTexCoord2f (target GLenum) - (s GLdouble) - (t GLdouble) + (s GLfloat) + (t GLfloat) -> void) (glMultiTexCoord3i @@ -11149,11 +11149,11 @@ between the execution of `glBegin' and the corresponding `glEnd'.") (r GLint) -> void) - (glMultiTexCoord3d + (glMultiTexCoord3f (target GLenum) - (s GLdouble) - (t GLdouble) - (r GLdouble) + (s GLfloat) + (t GLfloat) + (r GLfloat) -> void) (glMultiTexCoord4i @@ -11164,12 +11164,12 @@ between the execution of `glBegin' and the corresponding `glEnd'.") (q GLint) -> void) - (glMultiTexCoord4d + (glMultiTexCoord4f (target GLenum) - (s GLdouble) - (t GLdouble) - (r GLdouble) - (q GLdouble) + (s GLfloat) + (t GLfloat) + (r GLfloat) + (q GLfloat) -> void)) "Set the current texture coordinates. @@ -11203,7 +11203,7 @@ with each vertex and with the current raster position. Initially, the values for (S,TRQ) are (0,001) .") (define-foreign-procedure - ((glMultMatrixd (m *) -> void)) + ((glMultMatrixf (m *) -> void)) "Multiply the current matrix with the specified matrix. M @@ -11222,7 +11222,7 @@ between the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glMultTransposeMatrixd (m *) -> void)) + ((glMultTransposeMatrixf (m *) -> void)) "Multiply the current matrix with the specified row-major ordered matrix. M @@ -11369,10 +11369,10 @@ the normal array is used when `glDrawArrays', `glMultiDrawArrays', `GL_INVALID_VALUE' is generated if STRIDE is negative.") (define-foreign-procedure - ((glNormal3d - (nx GLdouble) - (ny GLdouble) - (nz GLdouble) + ((glNormal3f + (nx GLfloat) + (ny GLfloat) + (nz GLfloat) -> void) (glNormal3i @@ -13072,17 +13072,17 @@ executed between a call to `glBegin' and the corresponding call to (define-foreign-procedure ((glRasterPos2i (x GLint) (y GLint) -> void) - (glRasterPos2d (x GLdouble) (y GLdouble) -> void) + (glRasterPos2f (x GLfloat) (y GLfloat) -> void) (glRasterPos3i (x GLint) (y GLint) (z GLint) -> void) - (glRasterPos3d - (x GLdouble) - (y GLdouble) - (z GLdouble) + (glRasterPos3f + (x GLfloat) + (y GLfloat) + (z GLfloat) -> void) (glRasterPos4i @@ -13092,11 +13092,11 @@ executed between a call to `glBegin' and the corresponding call to (w GLint) -> void) - (glRasterPos4d - (x GLdouble) - (y GLdouble) - (z GLdouble) - (w GLdouble) + (glRasterPos4f + (x GLfloat) + (y GLfloat) + (z GLfloat) + (w GLfloat) -> void)) "Specify the raster position for pixel operations. @@ -13452,11 +13452,11 @@ between the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glRectd - (x1 GLdouble) - (y1 GLdouble) - (x2 GLdouble) - (y2 GLdouble) + ((glRectf + (x1 GLfloat) + (y1 GLfloat) + (x2 GLfloat) + (y2 GLfloat) -> void) (glRecti @@ -13600,11 +13600,11 @@ between the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glRotated - (angle GLdouble) - (x GLdouble) - (y GLdouble) - (z GLdouble) + ((glRotatef + (angle GLfloat) + (x GLfloat) + (y GLfloat) + (z GLfloat) -> void)) "Multiply the current matrix by a rotation matrix. @@ -13687,10 +13687,10 @@ between the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glScaled - (x GLdouble) - (y GLdouble) - (z GLdouble) + ((glScalef + (x GLfloat) + (y GLfloat) + (z GLfloat) -> void)) "Multiply the current matrix by a general scaling matrix. @@ -13831,10 +13831,10 @@ called. (blue GLint) -> void) - (glSecondaryColor3d - (red GLdouble) - (green GLdouble) - (blue GLdouble) + (glSecondaryColor3f + (red GLfloat) + (green GLfloat) + (blue GLfloat) -> void) (glSecondaryColor3ui @@ -14771,19 +14771,19 @@ called. (define-foreign-procedure ((glTexCoord1i (s GLint) -> void) - (glTexCoord1d (s GLdouble) -> void) + (glTexCoord1f (s GLfloat) -> void) (glTexCoord2i (s GLint) (t GLint) -> void) - (glTexCoord2d (s GLdouble) (t GLdouble) -> void) + (glTexCoord2f (s GLfloat) (t GLfloat) -> void) (glTexCoord3i (s GLint) (t GLint) (r GLint) -> void) - (glTexCoord3d - (s GLdouble) - (t GLdouble) - (r GLdouble) + (glTexCoord3f + (s GLfloat) + (t GLfloat) + (r GLfloat) -> void) (glTexCoord4i @@ -14793,11 +14793,11 @@ called. (q GLint) -> void) - (glTexCoord4d - (s GLdouble) - (t GLdouble) - (r GLdouble) - (q GLdouble) + (glTexCoord4f + (s GLfloat) + (t GLfloat) + (r GLfloat) + (q GLfloat) -> void)) "Set the current texture coordinates. @@ -15183,10 +15183,10 @@ the execution of `glBegin' and the corresponding execution of `glEnd'.") (param GLint) -> void) - (glTexGend + (glTexGenf (coord GLenum) (pname GLenum) - (param GLdouble) + (param GLfloat) -> void)) "Control the generation of texture coordinates. @@ -16972,10 +16972,10 @@ between the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure - ((glTranslated - (x GLdouble) - (y GLdouble) - (z GLdouble) + ((glTranslatef + (x GLfloat) + (y GLfloat) + (z GLfloat) -> void)) "Multiply the current matrix by a translation matrix. @@ -17376,14 +17376,20 @@ If enabled, the generic vertex attribute array is used when `GL_INVALID_VALUE' is generated if STRIDE is negative.") (define-foreign-procedure - ((glVertexAttrib1s + ((glVertexAttrib1f + (index GLuint) + (v0 GLfloat) + -> + void) + (glVertexAttrib1s (index GLuint) (v0 GLshort) -> void) - (glVertexAttrib1d + (glVertexAttrib2f (index GLuint) - (v0 GLdouble) + (v0 GLfloat) + (v1 GLfloat) -> void) (glVertexAttrib2s @@ -17392,10 +17398,11 @@ If enabled, the generic vertex attribute array is used when (v1 GLshort) -> void) - (glVertexAttrib2d + (glVertexAttrib3f (index GLuint) - (v0 GLdouble) - (v1 GLdouble) + (v0 GLfloat) + (v1 GLfloat) + (v2 GLfloat) -> void) (glVertexAttrib3s @@ -17405,11 +17412,12 @@ If enabled, the generic vertex attribute array is used when (v2 GLshort) -> void) - (glVertexAttrib3d + (glVertexAttrib4f (index GLuint) - (v0 GLdouble) - (v1 GLdouble) - (v2 GLdouble) + (v0 GLfloat) + (v1 GLfloat) + (v2 GLfloat) + (v3 GLfloat) -> void) (glVertexAttrib4s @@ -17420,14 +17428,6 @@ If enabled, the generic vertex attribute array is used when (v3 GLshort) -> void) - (glVertexAttrib4d - (index GLuint) - (v0 GLdouble) - (v1 GLdouble) - (v2 GLdouble) - (v3 GLdouble) - -> - void) (glVertexAttrib4Nub (index GLuint) (v0 GLubyte) @@ -17583,17 +17583,17 @@ the vertex array is used when `glArrayElement', `glDrawArrays', (define-foreign-procedure ((glVertex2i (x GLint) (y GLint) -> void) - (glVertex2d (x GLdouble) (y GLdouble) -> void) + (glVertex2f (x GLfloat) (y GLfloat) -> void) (glVertex3i (x GLint) (y GLint) (z GLint) -> void) - (glVertex3d - (x GLdouble) - (y GLdouble) - (z GLdouble) + (glVertex3f + (x GLfloat) + (y GLfloat) + (z GLfloat) -> void) (glVertex4i @@ -17603,11 +17603,11 @@ the vertex array is used when `glArrayElement', `glDrawArrays', (w GLint) -> void) - (glVertex4d - (x GLdouble) - (y GLdouble) - (z GLdouble) - (w GLdouble) + (glVertex4f + (x GLfloat) + (y GLfloat) + (z GLfloat) + (w GLfloat) -> void)) "Specify a vertex. @@ -17673,17 +17673,17 @@ the execution of `glBegin' and the corresponding execution of `glEnd'.") (define-foreign-procedure ((glWindowPos2i (x GLint) (y GLint) -> void) - (glWindowPos2d (x GLdouble) (y GLdouble) -> void) + (glWindowPos2f (x GLfloat) (y GLfloat) -> void) (glWindowPos3i (x GLint) (y GLint) (z GLint) -> void) - (glWindowPos3d - (x GLdouble) - (y GLdouble) - (z GLdouble) + (glWindowPos3f + (x GLfloat) + (y GLfloat) + (z GLfloat) -> void)) "Specify the raster position in window coordinates for pixel operations. diff --git a/figl/parse.scm b/figl/parse.scm index 707582d..102280a 100644 --- a/figl/parse.scm +++ b/figl/parse.scm @@ -193,9 +193,10 @@ (define (skip? s) (or - ;; Skip float variants if we have a double variant. - (and (string-suffix? "f" s) - (member (string-append (substring s 0 (1- (string-length s))) "d") + ;; Skip double variants if we have a float variant. + ;; (http://www.opengl.org/wiki/Common_Mistakes#GL_DOUBLE). + (and (string-suffix? "d" s) + (member (string-append (substring s 0 (1- (string-length s))) "f") all-names)) ;; Skip packed accessors like glVertex3fv. (string-suffix? "v" s) -- 2.20.1