/*
* Mesa 3-D graphics library
- * Version: 6.1
+ * Version: 6.5.1
*
- * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
#include "glheader.h"
#include "api_arrayelt.h"
#include "context.h"
-#include "glapi.h"
#include "imports.h"
#include "macros.h"
-#include "mtypes.h"
+#include "glapioffsets.h"
+#include "dispatch.h"
typedef void (GLAPIENTRY *array_func)( const void * );
typedef struct {
const struct gl_client_array *array;
- array_func func;
+ int offset;
} AEarray;
typedef void (GLAPIENTRY *attrib_func)( GLuint indx, const void *data );
#define AE_CONTEXT(ctx) ((AEcontext *)(ctx)->aelt_context)
+
/*
* Convert GL_BYTE, GL_UNSIGNED_BYTE, .. GL_DOUBLE into an integer
* in the range [0, 7]. Luckily these type tokens are sequentially
*/
#define TYPE_IDX(t) ( (t) == GL_DOUBLE ? 7 : (t) & 7 )
-static void GLAPIENTRY Color3bv(const GLbyte *v)
+static const int ColorFuncs[2][8] = {
+ {
+ _gloffset_Color3bv,
+ _gloffset_Color3ubv,
+ _gloffset_Color3sv,
+ _gloffset_Color3usv,
+ _gloffset_Color3iv,
+ _gloffset_Color3uiv,
+ _gloffset_Color3fv,
+ _gloffset_Color3dv,
+ },
+ {
+ _gloffset_Color4bv,
+ _gloffset_Color4ubv,
+ _gloffset_Color4sv,
+ _gloffset_Color4usv,
+ _gloffset_Color4iv,
+ _gloffset_Color4uiv,
+ _gloffset_Color4fv,
+ _gloffset_Color4dv,
+ },
+};
+
+static const int VertexFuncs[3][8] = {
+ {
+ -1,
+ -1,
+ _gloffset_Vertex2sv,
+ -1,
+ _gloffset_Vertex2iv,
+ -1,
+ _gloffset_Vertex2fv,
+ _gloffset_Vertex2dv,
+ },
+ {
+ -1,
+ -1,
+ _gloffset_Vertex3sv,
+ -1,
+ _gloffset_Vertex3iv,
+ -1,
+ _gloffset_Vertex3fv,
+ _gloffset_Vertex3dv,
+ },
+ {
+ -1,
+ -1,
+ _gloffset_Vertex4sv,
+ -1,
+ _gloffset_Vertex4iv,
+ -1,
+ _gloffset_Vertex4fv,
+ _gloffset_Vertex4dv,
+ },
+};
+
+static const int IndexFuncs[8] = {
+ -1,
+ _gloffset_Indexubv,
+ _gloffset_Indexsv,
+ -1,
+ _gloffset_Indexiv,
+ -1,
+ _gloffset_Indexfv,
+ _gloffset_Indexdv,
+};
+
+static const int NormalFuncs[8] = {
+ _gloffset_Normal3bv,
+ -1,
+ _gloffset_Normal3sv,
+ -1,
+ _gloffset_Normal3iv,
+ -1,
+ _gloffset_Normal3fv,
+ _gloffset_Normal3dv,
+};
+
+/* Note: _gloffset_* for these may not be a compile-time constant. */
+static int SecondaryColorFuncs[8];
+static int FogCoordFuncs[8];
+
+
+/**
+ ** GL_NV_vertex_program
+ **/
+
+/* GL_BYTE attributes */
+
+static void GLAPIENTRY VertexAttrib1NbvNV(GLuint index, const GLbyte *v)
{
- GL_CALL(Color3bv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY Color3ubv(const GLubyte *v)
+static void GLAPIENTRY VertexAttrib1bvNV(GLuint index, const GLbyte *v)
{
- GL_CALL(Color3ubv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY Color3sv(const GLshort *v)
+static void GLAPIENTRY VertexAttrib2NbvNV(GLuint index, const GLbyte *v)
{
- GL_CALL(Color3sv)(v);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY Color3usv(const GLushort *v)
+static void GLAPIENTRY VertexAttrib2bvNV(GLuint index, const GLbyte *v)
{
- GL_CALL(Color3usv)(v);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY Color3iv(const GLint *v)
+static void GLAPIENTRY VertexAttrib3NbvNV(GLuint index, const GLbyte *v)
{
- GL_CALL(Color3iv)(v);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),
+ BYTE_TO_FLOAT(v[1]),
+ BYTE_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY Color3uiv(const GLuint *v)
+static void GLAPIENTRY VertexAttrib3bvNV(GLuint index, const GLbyte *v)
{
- GL_CALL(Color3uiv)(v);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY Color3fv(const GLfloat *v)
+static void GLAPIENTRY VertexAttrib4NbvNV(GLuint index, const GLbyte *v)
{
- GL_CALL(Color3fv)(v);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),
+ BYTE_TO_FLOAT(v[1]),
+ BYTE_TO_FLOAT(v[2]),
+ BYTE_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY Color3dv(const GLdouble *v)
+static void GLAPIENTRY VertexAttrib4bvNV(GLuint index, const GLbyte *v)
{
- GL_CALL(Color3dv)(v);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
-static void GLAPIENTRY Color4bv(const GLbyte *v)
+/* GL_UNSIGNED_BYTE attributes */
+
+static void GLAPIENTRY VertexAttrib1NubvNV(GLuint index, const GLubyte *v)
{
- GL_CALL(Color4bv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY Color4ubv(const GLubyte *v)
+static void GLAPIENTRY VertexAttrib1ubvNV(GLuint index, const GLubyte *v)
{
- GL_CALL(Color4ubv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY Color4sv(const GLshort *v)
+static void GLAPIENTRY VertexAttrib2NubvNV(GLuint index, const GLubyte *v)
{
- GL_CALL(Color4sv)(v);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
+ UBYTE_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY Color4usv(const GLushort *v)
+static void GLAPIENTRY VertexAttrib2ubvNV(GLuint index, const GLubyte *v)
{
- GL_CALL(Color4usv)(v);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY Color4iv(const GLint *v)
+static void GLAPIENTRY VertexAttrib3NubvNV(GLuint index, const GLubyte *v)
{
- GL_CALL(Color4iv)(v);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
+ UBYTE_TO_FLOAT(v[1]),
+ UBYTE_TO_FLOAT(v[2])));
+}
+static void GLAPIENTRY VertexAttrib3ubvNV(GLuint index, const GLubyte *v)
+{
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY Color4uiv(const GLuint *v)
+static void GLAPIENTRY VertexAttrib4NubvNV(GLuint index, const GLubyte *v)
{
- GL_CALL(Color4uiv)(v);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
+ UBYTE_TO_FLOAT(v[1]),
+ UBYTE_TO_FLOAT(v[2]),
+ UBYTE_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY Color4fv(const GLfloat *v)
+static void GLAPIENTRY VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
{
- GL_CALL(Color4fv)(v);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
-static void GLAPIENTRY Color4dv(const GLdouble *v)
+/* GL_SHORT attributes */
+
+static void GLAPIENTRY VertexAttrib1NsvNV(GLuint index, const GLshort *v)
{
- GL_CALL(Color4dv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));
}
-static const array_func ColorFuncs[2][8] = {
- {
- (array_func) Color3bv,
- (array_func) Color3ubv,
- (array_func) Color3sv,
- (array_func) Color3usv,
- (array_func) Color3iv,
- (array_func) Color3uiv,
- (array_func) Color3fv,
- (array_func) Color3dv,
- },
- {
- (array_func) Color4bv,
- (array_func) Color4ubv,
- (array_func) Color4sv,
- (array_func) Color4usv,
- (array_func) Color4iv,
- (array_func) Color4uiv,
- (array_func) Color4fv,
- (array_func) Color4dv,
- },
-};
+static void GLAPIENTRY VertexAttrib1svNV(GLuint index, const GLshort *v)
+{
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
+}
-static void GLAPIENTRY Vertex2sv(const GLshort *v)
+static void GLAPIENTRY VertexAttrib2NsvNV(GLuint index, const GLshort *v)
{
- GL_CALL(Vertex2sv)(v);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
+ SHORT_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY Vertex2iv(const GLint *v)
+static void GLAPIENTRY VertexAttrib2svNV(GLuint index, const GLshort *v)
{
- GL_CALL(Vertex2iv)(v);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY Vertex2fv(const GLfloat *v)
+static void GLAPIENTRY VertexAttrib3NsvNV(GLuint index, const GLshort *v)
{
- GL_CALL(Vertex2fv)(v);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
+ SHORT_TO_FLOAT(v[1]),
+ SHORT_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY Vertex2dv(const GLdouble *v)
+static void GLAPIENTRY VertexAttrib3svNV(GLuint index, const GLshort *v)
{
- GL_CALL(Vertex2dv)(v);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY Vertex3sv(const GLshort *v)
+static void GLAPIENTRY VertexAttrib4NsvNV(GLuint index, const GLshort *v)
{
- GL_CALL(Vertex3sv)(v);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
+ SHORT_TO_FLOAT(v[1]),
+ SHORT_TO_FLOAT(v[2]),
+ SHORT_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY Vertex3iv(const GLint *v)
+static void GLAPIENTRY VertexAttrib4svNV(GLuint index, const GLshort *v)
{
- GL_CALL(Vertex3iv)(v);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
-static void GLAPIENTRY Vertex3fv(const GLfloat *v)
+/* GL_UNSIGNED_SHORT attributes */
+
+static void GLAPIENTRY VertexAttrib1NusvNV(GLuint index, const GLushort *v)
{
- GL_CALL(Vertex3fv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY Vertex3dv(const GLdouble *v)
+static void GLAPIENTRY VertexAttrib1usvNV(GLuint index, const GLushort *v)
{
- GL_CALL(Vertex3dv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY Vertex4sv(const GLshort *v)
+static void GLAPIENTRY VertexAttrib2NusvNV(GLuint index, const GLushort *v)
{
- GL_CALL(Vertex4sv)(v);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
+ USHORT_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY Vertex4iv(const GLint *v)
+static void GLAPIENTRY VertexAttrib2usvNV(GLuint index, const GLushort *v)
{
- GL_CALL(Vertex4iv)(v);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY Vertex4fv(const GLfloat *v)
+static void GLAPIENTRY VertexAttrib3NusvNV(GLuint index, const GLushort *v)
{
- GL_CALL(Vertex4fv)(v);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
+ USHORT_TO_FLOAT(v[1]),
+ USHORT_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY Vertex4dv(const GLdouble *v)
+static void GLAPIENTRY VertexAttrib3usvNV(GLuint index, const GLushort *v)
{
- GL_CALL(Vertex4dv)(v);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static const array_func VertexFuncs[3][8] = {
- {
- 0,
- 0,
- (array_func) Vertex2sv,
- 0,
- (array_func) Vertex2iv,
- 0,
- (array_func) Vertex2fv,
- (array_func) Vertex2dv,
- },
- {
- 0,
- 0,
- (array_func) Vertex3sv,
- 0,
- (array_func) Vertex3iv,
- 0,
- (array_func) Vertex3fv,
- (array_func) Vertex3dv,
- },
- {
- 0,
- 0,
- (array_func) Vertex4sv,
- 0,
- (array_func) Vertex4iv,
- 0,
- (array_func) Vertex4fv,
- (array_func) Vertex4dv,
- },
-};
+static void GLAPIENTRY VertexAttrib4NusvNV(GLuint index, const GLushort *v)
+{
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
+ USHORT_TO_FLOAT(v[1]),
+ USHORT_TO_FLOAT(v[2]),
+ USHORT_TO_FLOAT(v[3])));
+}
-static void GLAPIENTRY Indexubv(const GLubyte *c)
+static void GLAPIENTRY VertexAttrib4usvNV(GLuint index, const GLushort *v)
{
- GL_CALL(Indexubv)(c);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
-static void GLAPIENTRY Indexsv(const GLshort *c)
+/* GL_INT attributes */
+
+static void GLAPIENTRY VertexAttrib1NivNV(GLuint index, const GLint *v)
{
- GL_CALL(Indexsv)(c);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY Indexiv(const GLint *c)
+static void GLAPIENTRY VertexAttrib1ivNV(GLuint index, const GLint *v)
{
- GL_CALL(Indexiv)(c);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY Indexfv(const GLfloat *c)
+static void GLAPIENTRY VertexAttrib2NivNV(GLuint index, const GLint *v)
{
- GL_CALL(Indexfv)(c);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
+ INT_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY Indexdv(const GLdouble *c)
+static void GLAPIENTRY VertexAttrib2ivNV(GLuint index, const GLint *v)
{
- GL_CALL(Indexdv)(c);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
}
-static const array_func IndexFuncs[8] = {
- 0,
- (array_func) Indexubv,
- (array_func) Indexsv,
- 0,
- (array_func) Indexiv,
- 0,
- (array_func) Indexfv,
- (array_func) Indexdv,
-};
+static void GLAPIENTRY VertexAttrib3NivNV(GLuint index, const GLint *v)
+{
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
+ INT_TO_FLOAT(v[1]),
+ INT_TO_FLOAT(v[2])));
+}
-static void GLAPIENTRY Normal3bv(const GLbyte *v)
+static void GLAPIENTRY VertexAttrib3ivNV(GLuint index, const GLint *v)
{
- GL_CALL(Normal3bv)(v);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY Normal3sv(const GLshort *v)
+static void GLAPIENTRY VertexAttrib4NivNV(GLuint index, const GLint *v)
{
- GL_CALL(Normal3sv)(v);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
+ INT_TO_FLOAT(v[1]),
+ INT_TO_FLOAT(v[2]),
+ INT_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY Normal3iv(const GLint *v)
+static void GLAPIENTRY VertexAttrib4ivNV(GLuint index, const GLint *v)
{
- GL_CALL(Normal3iv)(v);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
-static void GLAPIENTRY Normal3fv(const GLfloat *v)
+/* GL_UNSIGNED_INT attributes */
+
+static void GLAPIENTRY VertexAttrib1NuivNV(GLuint index, const GLuint *v)
{
- GL_CALL(Normal3fv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY Normal3dv(const GLdouble *v)
+static void GLAPIENTRY VertexAttrib1uivNV(GLuint index, const GLuint *v)
{
- GL_CALL(Normal3dv)(v);
+ CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, v[0]));
}
-static const array_func NormalFuncs[8] = {
- (array_func) Normal3bv,
- 0,
- (array_func) Normal3sv,
- 0,
- (array_func) Normal3iv,
- 0,
- (array_func) Normal3fv,
- (array_func) Normal3dv,
-};
+static void GLAPIENTRY VertexAttrib2NuivNV(GLuint index, const GLuint *v)
+{
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
+ UINT_TO_FLOAT(v[1])));
+}
-/* Wrapper functions in case glSecondaryColor*EXT doesn't exist */
-static void GLAPIENTRY SecondaryColor3bvEXT(const GLbyte *c)
+static void GLAPIENTRY VertexAttrib2uivNV(GLuint index, const GLuint *v)
{
- GL_CALL(SecondaryColor3bvEXT)(c);
+ CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY SecondaryColor3ubvEXT(const GLubyte *c)
+static void GLAPIENTRY VertexAttrib3NuivNV(GLuint index, const GLuint *v)
{
- GL_CALL(SecondaryColor3ubvEXT)(c);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
+ UINT_TO_FLOAT(v[1]),
+ UINT_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY SecondaryColor3svEXT(const GLshort *c)
+static void GLAPIENTRY VertexAttrib3uivNV(GLuint index, const GLuint *v)
{
- GL_CALL(SecondaryColor3svEXT)(c);
+ CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY SecondaryColor3usvEXT(const GLushort *c)
+static void GLAPIENTRY VertexAttrib4NuivNV(GLuint index, const GLuint *v)
{
- GL_CALL(SecondaryColor3usvEXT)(c);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
+ UINT_TO_FLOAT(v[1]),
+ UINT_TO_FLOAT(v[2]),
+ UINT_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY SecondaryColor3ivEXT(const GLint *c)
+static void GLAPIENTRY VertexAttrib4uivNV(GLuint index, const GLuint *v)
{
- GL_CALL(SecondaryColor3ivEXT)(c);
+ CALL_VertexAttrib4fNV(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
-static void GLAPIENTRY SecondaryColor3uivEXT(const GLuint *c)
+/* GL_FLOAT attributes */
+
+static void GLAPIENTRY VertexAttrib1fvNV(GLuint index, const GLfloat *v)
{
- GL_CALL(SecondaryColor3uivEXT)(c);
+ CALL_VertexAttrib1fvNV(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY SecondaryColor3fvEXT(const GLfloat *c)
+static void GLAPIENTRY VertexAttrib2fvNV(GLuint index, const GLfloat *v)
{
- GL_CALL(SecondaryColor3fvEXT)(c);
+ CALL_VertexAttrib2fvNV(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY SecondaryColor3dvEXT(const GLdouble *c)
+static void GLAPIENTRY VertexAttrib3fvNV(GLuint index, const GLfloat *v)
{
- GL_CALL(SecondaryColor3dvEXT)(c);
+ CALL_VertexAttrib3fvNV(GET_DISPATCH(), (index, v));
}
-static const array_func SecondaryColorFuncs[8] = {
- (array_func) SecondaryColor3bvEXT,
- (array_func) SecondaryColor3ubvEXT,
- (array_func) SecondaryColor3svEXT,
- (array_func) SecondaryColor3usvEXT,
- (array_func) SecondaryColor3ivEXT,
- (array_func) SecondaryColor3uivEXT,
- (array_func) SecondaryColor3fvEXT,
- (array_func) SecondaryColor3dvEXT,
-};
+static void GLAPIENTRY VertexAttrib4fvNV(GLuint index, const GLfloat *v)
+{
+ CALL_VertexAttrib4fvNV(GET_DISPATCH(), (index, v));
+}
+
+/* GL_DOUBLE attributes */
+static void GLAPIENTRY VertexAttrib1dvNV(GLuint index, const GLdouble *v)
+{
+ CALL_VertexAttrib1dvNV(GET_DISPATCH(), (index, v));
+}
+
+static void GLAPIENTRY VertexAttrib2dvNV(GLuint index, const GLdouble *v)
+{
+ CALL_VertexAttrib2dvNV(GET_DISPATCH(), (index, v));
+}
-/* Again, wrapper functions in case glSecondaryColor*EXT doesn't exist */
-static void GLAPIENTRY FogCoordfvEXT(const GLfloat *f)
+static void GLAPIENTRY VertexAttrib3dvNV(GLuint index, const GLdouble *v)
{
- GL_CALL(FogCoordfvEXT)(f);
+ CALL_VertexAttrib3dvNV(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY FogCoorddvEXT(const GLdouble *f)
+static void GLAPIENTRY VertexAttrib4dvNV(GLuint index, const GLdouble *v)
{
- GL_CALL(FogCoorddvEXT)(f);
+ CALL_VertexAttrib4dvNV(GET_DISPATCH(), (index, v));
}
-static const array_func FogCoordFuncs[8] = {
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- (array_func) FogCoordfvEXT,
- (array_func) FogCoorddvEXT
+
+/*
+ * Array [size][type] of VertexAttrib functions
+ */
+static attrib_func AttribFuncsNV[2][4][8] = {
+ {
+ /* non-normalized */
+ {
+ /* size 1 */
+ (attrib_func) VertexAttrib1bvNV,
+ (attrib_func) VertexAttrib1ubvNV,
+ (attrib_func) VertexAttrib1svNV,
+ (attrib_func) VertexAttrib1usvNV,
+ (attrib_func) VertexAttrib1ivNV,
+ (attrib_func) VertexAttrib1uivNV,
+ (attrib_func) VertexAttrib1fvNV,
+ (attrib_func) VertexAttrib1dvNV
+ },
+ {
+ /* size 2 */
+ (attrib_func) VertexAttrib2bvNV,
+ (attrib_func) VertexAttrib2ubvNV,
+ (attrib_func) VertexAttrib2svNV,
+ (attrib_func) VertexAttrib2usvNV,
+ (attrib_func) VertexAttrib2ivNV,
+ (attrib_func) VertexAttrib2uivNV,
+ (attrib_func) VertexAttrib2fvNV,
+ (attrib_func) VertexAttrib2dvNV
+ },
+ {
+ /* size 3 */
+ (attrib_func) VertexAttrib3bvNV,
+ (attrib_func) VertexAttrib3ubvNV,
+ (attrib_func) VertexAttrib3svNV,
+ (attrib_func) VertexAttrib3usvNV,
+ (attrib_func) VertexAttrib3ivNV,
+ (attrib_func) VertexAttrib3uivNV,
+ (attrib_func) VertexAttrib3fvNV,
+ (attrib_func) VertexAttrib3dvNV
+ },
+ {
+ /* size 4 */
+ (attrib_func) VertexAttrib4bvNV,
+ (attrib_func) VertexAttrib4ubvNV,
+ (attrib_func) VertexAttrib4svNV,
+ (attrib_func) VertexAttrib4usvNV,
+ (attrib_func) VertexAttrib4ivNV,
+ (attrib_func) VertexAttrib4uivNV,
+ (attrib_func) VertexAttrib4fvNV,
+ (attrib_func) VertexAttrib4dvNV
+ }
+ },
+ {
+ /* normalized (except for float/double) */
+ {
+ /* size 1 */
+ (attrib_func) VertexAttrib1NbvNV,
+ (attrib_func) VertexAttrib1NubvNV,
+ (attrib_func) VertexAttrib1NsvNV,
+ (attrib_func) VertexAttrib1NusvNV,
+ (attrib_func) VertexAttrib1NivNV,
+ (attrib_func) VertexAttrib1NuivNV,
+ (attrib_func) VertexAttrib1fvNV,
+ (attrib_func) VertexAttrib1dvNV
+ },
+ {
+ /* size 2 */
+ (attrib_func) VertexAttrib2NbvNV,
+ (attrib_func) VertexAttrib2NubvNV,
+ (attrib_func) VertexAttrib2NsvNV,
+ (attrib_func) VertexAttrib2NusvNV,
+ (attrib_func) VertexAttrib2NivNV,
+ (attrib_func) VertexAttrib2NuivNV,
+ (attrib_func) VertexAttrib2fvNV,
+ (attrib_func) VertexAttrib2dvNV
+ },
+ {
+ /* size 3 */
+ (attrib_func) VertexAttrib3NbvNV,
+ (attrib_func) VertexAttrib3NubvNV,
+ (attrib_func) VertexAttrib3NsvNV,
+ (attrib_func) VertexAttrib3NusvNV,
+ (attrib_func) VertexAttrib3NivNV,
+ (attrib_func) VertexAttrib3NuivNV,
+ (attrib_func) VertexAttrib3fvNV,
+ (attrib_func) VertexAttrib3dvNV
+ },
+ {
+ /* size 4 */
+ (attrib_func) VertexAttrib4NbvNV,
+ (attrib_func) VertexAttrib4NubvNV,
+ (attrib_func) VertexAttrib4NsvNV,
+ (attrib_func) VertexAttrib4NusvNV,
+ (attrib_func) VertexAttrib4NivNV,
+ (attrib_func) VertexAttrib4NuivNV,
+ (attrib_func) VertexAttrib4fvNV,
+ (attrib_func) VertexAttrib4dvNV
+ }
+ }
};
-/**********************************************************************/
+
+/**
+ ** GL_ARB_vertex_program
+ **/
/* GL_BYTE attributes */
-static void GLAPIENTRY VertexAttrib1Nbv(GLuint index, const GLbyte *v)
+static void GLAPIENTRY VertexAttrib1NbvARB(GLuint index, const GLbyte *v)
{
- GL_CALL(VertexAttrib1fNV)(index, BYTE_TO_FLOAT(v[0]));
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY VertexAttrib1bv(GLuint index, const GLbyte *v)
+static void GLAPIENTRY VertexAttrib1bvARB(GLuint index, const GLbyte *v)
{
- GL_CALL(VertexAttrib1fNV)(index, v[0]);
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY VertexAttrib2Nbv(GLuint index, const GLbyte *v)
+static void GLAPIENTRY VertexAttrib2NbvARB(GLuint index, const GLbyte *v)
{
- GL_CALL(VertexAttrib2fNV)(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]));
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY VertexAttrib2bv(GLuint index, const GLbyte *v)
+static void GLAPIENTRY VertexAttrib2bvARB(GLuint index, const GLbyte *v)
{
- GL_CALL(VertexAttrib2fNV)(index, v[0], v[1]);
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY VertexAttrib3Nbv(GLuint index, const GLbyte *v)
+static void GLAPIENTRY VertexAttrib3NbvARB(GLuint index, const GLbyte *v)
{
- GL_CALL(VertexAttrib3fNV)(index, BYTE_TO_FLOAT(v[0]),
- BYTE_TO_FLOAT(v[1]),
- BYTE_TO_FLOAT(v[2]));
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),
+ BYTE_TO_FLOAT(v[1]),
+ BYTE_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY VertexAttrib3bv(GLuint index, const GLbyte *v)
+static void GLAPIENTRY VertexAttrib3bvARB(GLuint index, const GLbyte *v)
{
- GL_CALL(VertexAttrib3fNV)(index, v[0], v[1], v[2]);
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY VertexAttrib4Nbv(GLuint index, const GLbyte *v)
+static void GLAPIENTRY VertexAttrib4NbvARB(GLuint index, const GLbyte *v)
{
- GL_CALL(VertexAttrib4fNV)(index, BYTE_TO_FLOAT(v[0]),
- BYTE_TO_FLOAT(v[1]),
- BYTE_TO_FLOAT(v[2]),
- BYTE_TO_FLOAT(v[3]));
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]),
+ BYTE_TO_FLOAT(v[1]),
+ BYTE_TO_FLOAT(v[2]),
+ BYTE_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY VertexAttrib4bv(GLuint index, const GLbyte *v)
+static void GLAPIENTRY VertexAttrib4bvARB(GLuint index, const GLbyte *v)
{
- GL_CALL(VertexAttrib4fNV)(index, v[0], v[1], v[2], v[3]);
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
/* GL_UNSIGNED_BYTE attributes */
-static void GLAPIENTRY VertexAttrib1Nubv(GLuint index, const GLubyte *v)
+static void GLAPIENTRY VertexAttrib1NubvARB(GLuint index, const GLubyte *v)
{
- GL_CALL(VertexAttrib1fNV)(index, UBYTE_TO_FLOAT(v[0]));
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY VertexAttrib1ubv(GLuint index, const GLubyte *v)
+static void GLAPIENTRY VertexAttrib1ubvARB(GLuint index, const GLubyte *v)
{
- GL_CALL(VertexAttrib1fNV)(index, v[0]);
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY VertexAttrib2Nubv(GLuint index, const GLubyte *v)
+static void GLAPIENTRY VertexAttrib2NubvARB(GLuint index, const GLubyte *v)
{
- GL_CALL(VertexAttrib2fNV)(index, UBYTE_TO_FLOAT(v[0]),
- UBYTE_TO_FLOAT(v[1]));
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
+ UBYTE_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY VertexAttrib2ubv(GLuint index, const GLubyte *v)
+static void GLAPIENTRY VertexAttrib2ubvARB(GLuint index, const GLubyte *v)
{
- GL_CALL(VertexAttrib2fNV)(index, v[0], v[1]);
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY VertexAttrib3Nubv(GLuint index, const GLubyte *v)
+static void GLAPIENTRY VertexAttrib3NubvARB(GLuint index, const GLubyte *v)
{
- GL_CALL(VertexAttrib3fNV)(index, UBYTE_TO_FLOAT(v[0]),
- UBYTE_TO_FLOAT(v[1]),
- UBYTE_TO_FLOAT(v[2]));
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
+ UBYTE_TO_FLOAT(v[1]),
+ UBYTE_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY VertexAttrib3ubv(GLuint index, const GLubyte *v)
+static void GLAPIENTRY VertexAttrib3ubvARB(GLuint index, const GLubyte *v)
{
- GL_CALL(VertexAttrib3fNV)(index, v[0], v[1], v[2]);
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY VertexAttrib4Nubv(GLuint index, const GLubyte *v)
+static void GLAPIENTRY VertexAttrib4NubvARB(GLuint index, const GLubyte *v)
{
- GL_CALL(VertexAttrib4fNV)(index, UBYTE_TO_FLOAT(v[0]),
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),
UBYTE_TO_FLOAT(v[1]),
UBYTE_TO_FLOAT(v[2]),
- UBYTE_TO_FLOAT(v[3]));
+ UBYTE_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY VertexAttrib4ubv(GLuint index, const GLubyte *v)
+static void GLAPIENTRY VertexAttrib4ubvARB(GLuint index, const GLubyte *v)
{
- GL_CALL(VertexAttrib4fNV)(index, v[0], v[1], v[2], v[3]);
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
/* GL_SHORT attributes */
-static void GLAPIENTRY VertexAttrib1Nsv(GLuint index, const GLshort *v)
+static void GLAPIENTRY VertexAttrib1NsvARB(GLuint index, const GLshort *v)
{
- GL_CALL(VertexAttrib1fNV)(index, SHORT_TO_FLOAT(v[0]));
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY VertexAttrib1sv(GLuint index, const GLshort *v)
+static void GLAPIENTRY VertexAttrib1svARB(GLuint index, const GLshort *v)
{
- GL_CALL(VertexAttrib1fNV)(index, v[0]);
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY VertexAttrib2Nsv(GLuint index, const GLshort *v)
+static void GLAPIENTRY VertexAttrib2NsvARB(GLuint index, const GLshort *v)
{
- GL_CALL(VertexAttrib2fNV)(index, SHORT_TO_FLOAT(v[0]),
- SHORT_TO_FLOAT(v[1]));
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
+ SHORT_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY VertexAttrib2sv(GLuint index, const GLshort *v)
+static void GLAPIENTRY VertexAttrib2svARB(GLuint index, const GLshort *v)
{
- GL_CALL(VertexAttrib2fNV)(index, v[0], v[1]);
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY VertexAttrib3Nsv(GLuint index, const GLshort *v)
+static void GLAPIENTRY VertexAttrib3NsvARB(GLuint index, const GLshort *v)
{
- GL_CALL(VertexAttrib3fNV)(index, SHORT_TO_FLOAT(v[0]),
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
SHORT_TO_FLOAT(v[1]),
- SHORT_TO_FLOAT(v[2]));
+ SHORT_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY VertexAttrib3sv(GLuint index, const GLshort *v)
+static void GLAPIENTRY VertexAttrib3svARB(GLuint index, const GLshort *v)
{
- GL_CALL(VertexAttrib3fNV)(index, v[0], v[1], v[2]);
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY VertexAttrib4Nsv(GLuint index, const GLshort *v)
+static void GLAPIENTRY VertexAttrib4NsvARB(GLuint index, const GLshort *v)
{
- GL_CALL(VertexAttrib4fNV)(index, SHORT_TO_FLOAT(v[0]),
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),
SHORT_TO_FLOAT(v[1]),
SHORT_TO_FLOAT(v[2]),
- SHORT_TO_FLOAT(v[3]));
+ SHORT_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY VertexAttrib4sv(GLuint index, const GLshort *v)
+static void GLAPIENTRY VertexAttrib4svARB(GLuint index, const GLshort *v)
{
- GL_CALL(VertexAttrib4fNV)(index, v[0], v[1], v[2], v[3]);
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
/* GL_UNSIGNED_SHORT attributes */
-static void GLAPIENTRY VertexAttrib1Nusv(GLuint index, const GLushort *v)
+static void GLAPIENTRY VertexAttrib1NusvARB(GLuint index, const GLushort *v)
{
- GL_CALL(VertexAttrib1fNV)(index, USHORT_TO_FLOAT(v[0]));
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY VertexAttrib1usv(GLuint index, const GLushort *v)
+static void GLAPIENTRY VertexAttrib1usvARB(GLuint index, const GLushort *v)
{
- GL_CALL(VertexAttrib1fNV)(index, v[0]);
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY VertexAttrib2Nusv(GLuint index, const GLushort *v)
+static void GLAPIENTRY VertexAttrib2NusvARB(GLuint index, const GLushort *v)
{
- GL_CALL(VertexAttrib2fNV)(index, USHORT_TO_FLOAT(v[0]),
- USHORT_TO_FLOAT(v[1]));
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
+ USHORT_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY VertexAttrib2usv(GLuint index, const GLushort *v)
+static void GLAPIENTRY VertexAttrib2usvARB(GLuint index, const GLushort *v)
{
- GL_CALL(VertexAttrib2fNV)(index, v[0], v[1]);
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY VertexAttrib3Nusv(GLuint index, const GLushort *v)
+static void GLAPIENTRY VertexAttrib3NusvARB(GLuint index, const GLushort *v)
{
- GL_CALL(VertexAttrib3fNV)(index, USHORT_TO_FLOAT(v[0]),
- USHORT_TO_FLOAT(v[1]),
- USHORT_TO_FLOAT(v[2]));
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
+ USHORT_TO_FLOAT(v[1]),
+ USHORT_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY VertexAttrib3usv(GLuint index, const GLushort *v)
+static void GLAPIENTRY VertexAttrib3usvARB(GLuint index, const GLushort *v)
{
- GL_CALL(VertexAttrib3fNV)(index, v[0], v[1], v[2]);
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY VertexAttrib4Nusv(GLuint index, const GLushort *v)
+static void GLAPIENTRY VertexAttrib4NusvARB(GLuint index, const GLushort *v)
{
- GL_CALL(VertexAttrib4fNV)(index, USHORT_TO_FLOAT(v[0]),
- USHORT_TO_FLOAT(v[1]),
- USHORT_TO_FLOAT(v[2]),
- USHORT_TO_FLOAT(v[3]));
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),
+ USHORT_TO_FLOAT(v[1]),
+ USHORT_TO_FLOAT(v[2]),
+ USHORT_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY VertexAttrib4usv(GLuint index, const GLushort *v)
+static void GLAPIENTRY VertexAttrib4usvARB(GLuint index, const GLushort *v)
{
- GL_CALL(VertexAttrib4fNV)(index, v[0], v[1], v[2], v[3]);
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
/* GL_INT attributes */
-static void GLAPIENTRY VertexAttrib1Niv(GLuint index, const GLint *v)
+static void GLAPIENTRY VertexAttrib1NivARB(GLuint index, const GLint *v)
{
- GL_CALL(VertexAttrib1fNV)(index, INT_TO_FLOAT(v[0]));
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY VertexAttrib1iv(GLuint index, const GLint *v)
+static void GLAPIENTRY VertexAttrib1ivARB(GLuint index, const GLint *v)
{
- GL_CALL(VertexAttrib1fNV)(index, v[0]);
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY VertexAttrib2Niv(GLuint index, const GLint *v)
+static void GLAPIENTRY VertexAttrib2NivARB(GLuint index, const GLint *v)
{
- GL_CALL(VertexAttrib2fNV)(index, INT_TO_FLOAT(v[0]),
- INT_TO_FLOAT(v[1]));
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
+ INT_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY VertexAttrib2iv(GLuint index, const GLint *v)
+static void GLAPIENTRY VertexAttrib2ivARB(GLuint index, const GLint *v)
{
- GL_CALL(VertexAttrib2fNV)(index, v[0], v[1]);
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY VertexAttrib3Niv(GLuint index, const GLint *v)
+static void GLAPIENTRY VertexAttrib3NivARB(GLuint index, const GLint *v)
{
- GL_CALL(VertexAttrib3fNV)(index, INT_TO_FLOAT(v[0]),
- INT_TO_FLOAT(v[1]),
- INT_TO_FLOAT(v[2]));
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
+ INT_TO_FLOAT(v[1]),
+ INT_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY VertexAttrib3iv(GLuint index, const GLint *v)
+static void GLAPIENTRY VertexAttrib3ivARB(GLuint index, const GLint *v)
{
- GL_CALL(VertexAttrib3fNV)(index, v[0], v[1], v[2]);
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY VertexAttrib4Niv(GLuint index, const GLint *v)
+static void GLAPIENTRY VertexAttrib4NivARB(GLuint index, const GLint *v)
{
- GL_CALL(VertexAttrib4fNV)(index, INT_TO_FLOAT(v[0]),
- INT_TO_FLOAT(v[1]),
- INT_TO_FLOAT(v[2]),
- INT_TO_FLOAT(v[3]));
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),
+ INT_TO_FLOAT(v[1]),
+ INT_TO_FLOAT(v[2]),
+ INT_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY VertexAttrib4iv(GLuint index, const GLint *v)
+static void GLAPIENTRY VertexAttrib4ivARB(GLuint index, const GLint *v)
{
- GL_CALL(VertexAttrib4fNV)(index, v[0], v[1], v[2], v[3]);
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
/* GL_UNSIGNED_INT attributes */
-static void GLAPIENTRY VertexAttrib1Nuiv(GLuint index, const GLuint *v)
+static void GLAPIENTRY VertexAttrib1NuivARB(GLuint index, const GLuint *v)
{
- GL_CALL(VertexAttrib1fNV)(index, UINT_TO_FLOAT(v[0]));
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));
}
-static void GLAPIENTRY VertexAttrib1uiv(GLuint index, const GLuint *v)
+static void GLAPIENTRY VertexAttrib1uivARB(GLuint index, const GLuint *v)
{
- GL_CALL(VertexAttrib1fNV)(index, v[0]);
+ CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, v[0]));
}
-static void GLAPIENTRY VertexAttrib2Nuiv(GLuint index, const GLuint *v)
+static void GLAPIENTRY VertexAttrib2NuivARB(GLuint index, const GLuint *v)
{
- GL_CALL(VertexAttrib2fNV)(index, UINT_TO_FLOAT(v[0]),
- UINT_TO_FLOAT(v[1]));
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
+ UINT_TO_FLOAT(v[1])));
}
-static void GLAPIENTRY VertexAttrib2uiv(GLuint index, const GLuint *v)
+static void GLAPIENTRY VertexAttrib2uivARB(GLuint index, const GLuint *v)
{
- GL_CALL(VertexAttrib2fNV)(index, v[0], v[1]);
+ CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, v[0], v[1]));
}
-static void GLAPIENTRY VertexAttrib3Nuiv(GLuint index, const GLuint *v)
+static void GLAPIENTRY VertexAttrib3NuivARB(GLuint index, const GLuint *v)
{
- GL_CALL(VertexAttrib3fNV)(index, UINT_TO_FLOAT(v[0]),
- UINT_TO_FLOAT(v[1]),
- UINT_TO_FLOAT(v[2]));
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
+ UINT_TO_FLOAT(v[1]),
+ UINT_TO_FLOAT(v[2])));
}
-static void GLAPIENTRY VertexAttrib3uiv(GLuint index, const GLuint *v)
+static void GLAPIENTRY VertexAttrib3uivARB(GLuint index, const GLuint *v)
{
- GL_CALL(VertexAttrib3fNV)(index, v[0], v[1], v[2]);
+ CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, v[0], v[1], v[2]));
}
-static void GLAPIENTRY VertexAttrib4Nuiv(GLuint index, const GLuint *v)
+static void GLAPIENTRY VertexAttrib4NuivARB(GLuint index, const GLuint *v)
{
- GL_CALL(VertexAttrib4fNV)(index, UINT_TO_FLOAT(v[0]),
- UINT_TO_FLOAT(v[1]),
- UINT_TO_FLOAT(v[2]),
- UINT_TO_FLOAT(v[3]));
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),
+ UINT_TO_FLOAT(v[1]),
+ UINT_TO_FLOAT(v[2]),
+ UINT_TO_FLOAT(v[3])));
}
-static void GLAPIENTRY VertexAttrib4uiv(GLuint index, const GLuint *v)
+static void GLAPIENTRY VertexAttrib4uivARB(GLuint index, const GLuint *v)
{
- GL_CALL(VertexAttrib4fNV)(index, v[0], v[1], v[2], v[3]);
+ CALL_VertexAttrib4fARB(GET_DISPATCH(), (index, v[0], v[1], v[2], v[3]));
}
/* GL_FLOAT attributes */
-static void GLAPIENTRY VertexAttrib1fv(GLuint index, const GLfloat *v)
+static void GLAPIENTRY VertexAttrib1fvARB(GLuint index, const GLfloat *v)
{
- GL_CALL(VertexAttrib1fvNV)(index, v);
+ CALL_VertexAttrib1fvARB(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY VertexAttrib2fv(GLuint index, const GLfloat *v)
+static void GLAPIENTRY VertexAttrib2fvARB(GLuint index, const GLfloat *v)
{
- GL_CALL(VertexAttrib2fvNV)(index, v);
+ CALL_VertexAttrib2fvARB(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY VertexAttrib3fv(GLuint index, const GLfloat *v)
+static void GLAPIENTRY VertexAttrib3fvARB(GLuint index, const GLfloat *v)
{
- GL_CALL(VertexAttrib3fvNV)(index, v);
+ CALL_VertexAttrib3fvARB(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY VertexAttrib4fv(GLuint index, const GLfloat *v)
+static void GLAPIENTRY VertexAttrib4fvARB(GLuint index, const GLfloat *v)
{
- GL_CALL(VertexAttrib4fvNV)(index, v);
+ CALL_VertexAttrib4fvARB(GET_DISPATCH(), (index, v));
}
/* GL_DOUBLE attributes */
-static void GLAPIENTRY VertexAttrib1dv(GLuint index, const GLdouble *v)
+static void GLAPIENTRY VertexAttrib1dvARB(GLuint index, const GLdouble *v)
{
- GL_CALL(VertexAttrib1dvNV)(index, v);
+ CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY VertexAttrib2dv(GLuint index, const GLdouble *v)
+static void GLAPIENTRY VertexAttrib2dvARB(GLuint index, const GLdouble *v)
{
- GL_CALL(VertexAttrib2dvNV)(index, v);
+ CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY VertexAttrib3dv(GLuint index, const GLdouble *v)
+static void GLAPIENTRY VertexAttrib3dvARB(GLuint index, const GLdouble *v)
{
- GL_CALL(VertexAttrib3dvNV)(index, v);
+ CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v));
}
-static void GLAPIENTRY VertexAttrib4dv(GLuint index, const GLdouble *v)
+static void GLAPIENTRY VertexAttrib4dvARB(GLuint index, const GLdouble *v)
{
- GL_CALL(VertexAttrib4dvNV)(index, v);
+ CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v));
}
/*
* Array [size][type] of VertexAttrib functions
*/
-static const attrib_func AttribFuncs[2][4][8] = {
+static attrib_func AttribFuncsARB[2][4][8] = {
{
/* non-normalized */
{
/* size 1 */
- (attrib_func) VertexAttrib1bv,
- (attrib_func) VertexAttrib1ubv,
- (attrib_func) VertexAttrib1sv,
- (attrib_func) VertexAttrib1usv,
- (attrib_func) VertexAttrib1iv,
- (attrib_func) VertexAttrib1uiv,
- (attrib_func) VertexAttrib1fv,
- (attrib_func) VertexAttrib1dv
+ (attrib_func) VertexAttrib1bvARB,
+ (attrib_func) VertexAttrib1ubvARB,
+ (attrib_func) VertexAttrib1svARB,
+ (attrib_func) VertexAttrib1usvARB,
+ (attrib_func) VertexAttrib1ivARB,
+ (attrib_func) VertexAttrib1uivARB,
+ (attrib_func) VertexAttrib1fvARB,
+ (attrib_func) VertexAttrib1dvARB
},
{
/* size 2 */
- (attrib_func) VertexAttrib2bv,
- (attrib_func) VertexAttrib2ubv,
- (attrib_func) VertexAttrib2sv,
- (attrib_func) VertexAttrib2usv,
- (attrib_func) VertexAttrib2iv,
- (attrib_func) VertexAttrib2uiv,
- (attrib_func) VertexAttrib2fv,
- (attrib_func) VertexAttrib2dv
+ (attrib_func) VertexAttrib2bvARB,
+ (attrib_func) VertexAttrib2ubvARB,
+ (attrib_func) VertexAttrib2svARB,
+ (attrib_func) VertexAttrib2usvARB,
+ (attrib_func) VertexAttrib2ivARB,
+ (attrib_func) VertexAttrib2uivARB,
+ (attrib_func) VertexAttrib2fvARB,
+ (attrib_func) VertexAttrib2dvARB
},
{
/* size 3 */
- (attrib_func) VertexAttrib3bv,
- (attrib_func) VertexAttrib3ubv,
- (attrib_func) VertexAttrib3sv,
- (attrib_func) VertexAttrib3usv,
- (attrib_func) VertexAttrib3iv,
- (attrib_func) VertexAttrib3uiv,
- (attrib_func) VertexAttrib3fv,
- (attrib_func) VertexAttrib3dv
+ (attrib_func) VertexAttrib3bvARB,
+ (attrib_func) VertexAttrib3ubvARB,
+ (attrib_func) VertexAttrib3svARB,
+ (attrib_func) VertexAttrib3usvARB,
+ (attrib_func) VertexAttrib3ivARB,
+ (attrib_func) VertexAttrib3uivARB,
+ (attrib_func) VertexAttrib3fvARB,
+ (attrib_func) VertexAttrib3dvARB
},
{
/* size 4 */
- (attrib_func) VertexAttrib4bv,
- (attrib_func) VertexAttrib4ubv,
- (attrib_func) VertexAttrib4sv,
- (attrib_func) VertexAttrib4usv,
- (attrib_func) VertexAttrib4iv,
- (attrib_func) VertexAttrib4uiv,
- (attrib_func) VertexAttrib4fv,
- (attrib_func) VertexAttrib4dv
+ (attrib_func) VertexAttrib4bvARB,
+ (attrib_func) VertexAttrib4ubvARB,
+ (attrib_func) VertexAttrib4svARB,
+ (attrib_func) VertexAttrib4usvARB,
+ (attrib_func) VertexAttrib4ivARB,
+ (attrib_func) VertexAttrib4uivARB,
+ (attrib_func) VertexAttrib4fvARB,
+ (attrib_func) VertexAttrib4dvARB
}
},
{
/* normalized (except for float/double) */
{
/* size 1 */
- (attrib_func) VertexAttrib1Nbv,
- (attrib_func) VertexAttrib1Nubv,
- (attrib_func) VertexAttrib1Nsv,
- (attrib_func) VertexAttrib1Nusv,
- (attrib_func) VertexAttrib1Niv,
- (attrib_func) VertexAttrib1Nuiv,
- (attrib_func) VertexAttrib1fv,
- (attrib_func) VertexAttrib1dv
+ (attrib_func) VertexAttrib1NbvARB,
+ (attrib_func) VertexAttrib1NubvARB,
+ (attrib_func) VertexAttrib1NsvARB,
+ (attrib_func) VertexAttrib1NusvARB,
+ (attrib_func) VertexAttrib1NivARB,
+ (attrib_func) VertexAttrib1NuivARB,
+ (attrib_func) VertexAttrib1fvARB,
+ (attrib_func) VertexAttrib1dvARB
},
{
/* size 2 */
- (attrib_func) VertexAttrib2Nbv,
- (attrib_func) VertexAttrib2Nubv,
- (attrib_func) VertexAttrib2Nsv,
- (attrib_func) VertexAttrib2Nusv,
- (attrib_func) VertexAttrib2Niv,
- (attrib_func) VertexAttrib2Nuiv,
- (attrib_func) VertexAttrib2fv,
- (attrib_func) VertexAttrib2dv
+ (attrib_func) VertexAttrib2NbvARB,
+ (attrib_func) VertexAttrib2NubvARB,
+ (attrib_func) VertexAttrib2NsvARB,
+ (attrib_func) VertexAttrib2NusvARB,
+ (attrib_func) VertexAttrib2NivARB,
+ (attrib_func) VertexAttrib2NuivARB,
+ (attrib_func) VertexAttrib2fvARB,
+ (attrib_func) VertexAttrib2dvARB
},
{
/* size 3 */
- (attrib_func) VertexAttrib3Nbv,
- (attrib_func) VertexAttrib3Nubv,
- (attrib_func) VertexAttrib3Nsv,
- (attrib_func) VertexAttrib3Nusv,
- (attrib_func) VertexAttrib3Niv,
- (attrib_func) VertexAttrib3Nuiv,
- (attrib_func) VertexAttrib3fv,
- (attrib_func) VertexAttrib3dv
+ (attrib_func) VertexAttrib3NbvARB,
+ (attrib_func) VertexAttrib3NubvARB,
+ (attrib_func) VertexAttrib3NsvARB,
+ (attrib_func) VertexAttrib3NusvARB,
+ (attrib_func) VertexAttrib3NivARB,
+ (attrib_func) VertexAttrib3NuivARB,
+ (attrib_func) VertexAttrib3fvARB,
+ (attrib_func) VertexAttrib3dvARB
},
{
/* size 4 */
- (attrib_func) VertexAttrib4Nbv,
- (attrib_func) VertexAttrib4Nubv,
- (attrib_func) VertexAttrib4Nsv,
- (attrib_func) VertexAttrib4Nusv,
- (attrib_func) VertexAttrib4Niv,
- (attrib_func) VertexAttrib4Nuiv,
- (attrib_func) VertexAttrib4fv,
- (attrib_func) VertexAttrib4dv
+ (attrib_func) VertexAttrib4NbvARB,
+ (attrib_func) VertexAttrib4NubvARB,
+ (attrib_func) VertexAttrib4NsvARB,
+ (attrib_func) VertexAttrib4NusvARB,
+ (attrib_func) VertexAttrib4NivARB,
+ (attrib_func) VertexAttrib4NuivARB,
+ (attrib_func) VertexAttrib4fvARB,
+ (attrib_func) VertexAttrib4dvARB
}
}
};
-static void GLAPIENTRY EdgeFlagv(const GLboolean *flag)
-{
- GL_CALL(EdgeFlagv)(flag);
-}
-
/**********************************************************************/
if (ctx->aelt_context)
return GL_TRUE;
+ /* These _gloffset_* values may not be compile-time constants */
+ SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT;
+ SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT;
+ SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT;
+ SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usvEXT;
+ SecondaryColorFuncs[4] = _gloffset_SecondaryColor3ivEXT;
+ SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uivEXT;
+ SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT;
+ SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT;
+
+ FogCoordFuncs[0] = -1;
+ FogCoordFuncs[1] = -1;
+ FogCoordFuncs[2] = -1;
+ FogCoordFuncs[3] = -1;
+ FogCoordFuncs[4] = -1;
+ FogCoordFuncs[5] = -1;
+ FogCoordFuncs[6] = _gloffset_FogCoordfvEXT;
+ FogCoordFuncs[7] = _gloffset_FogCoorddvEXT;
+
ctx->aelt_context = MALLOC( sizeof(AEcontext) );
if (!ctx->aelt_context)
return GL_FALSE;
{
if ( AE_CONTEXT( ctx ) ) {
FREE( ctx->aelt_context );
- ctx->aelt_context = 0;
+ ctx->aelt_context = NULL;
}
}
GLuint i;
/* conventional vertex arrays */
- if (ctx->Array.Index.Enabled) {
- aa->array = &ctx->Array.Index;
- aa->func = IndexFuncs[TYPE_IDX(aa->array->Type)];
+ if (ctx->Array.ArrayObj->Index.Enabled) {
+ aa->array = &ctx->Array.ArrayObj->Index;
+ aa->offset = IndexFuncs[TYPE_IDX(aa->array->Type)];
aa++;
}
- if (ctx->Array.EdgeFlag.Enabled) {
- aa->array = &ctx->Array.EdgeFlag;
- aa->func = (array_func) EdgeFlagv;
+ if (ctx->Array.ArrayObj->EdgeFlag.Enabled) {
+ aa->array = &ctx->Array.ArrayObj->EdgeFlag;
+ aa->offset = _gloffset_EdgeFlagv;
aa++;
}
- if (ctx->Array.Normal.Enabled) {
- aa->array = &ctx->Array.Normal;
- aa->func = NormalFuncs[TYPE_IDX(aa->array->Type)];
+ if (ctx->Array.ArrayObj->Normal.Enabled) {
+ aa->array = &ctx->Array.ArrayObj->Normal;
+ aa->offset = NormalFuncs[TYPE_IDX(aa->array->Type)];
aa++;
}
- if (ctx->Array.Color.Enabled) {
- aa->array = &ctx->Array.Color;
- aa->func = ColorFuncs[aa->array->Size-3][TYPE_IDX(aa->array->Type)];
+ if (ctx->Array.ArrayObj->Color.Enabled) {
+ aa->array = &ctx->Array.ArrayObj->Color;
+ aa->offset = ColorFuncs[aa->array->Size-3][TYPE_IDX(aa->array->Type)];
aa++;
}
- if (ctx->Array.SecondaryColor.Enabled) {
- aa->array = &ctx->Array.SecondaryColor;
- aa->func = SecondaryColorFuncs[TYPE_IDX(aa->array->Type)];
+ if (ctx->Array.ArrayObj->SecondaryColor.Enabled) {
+ aa->array = &ctx->Array.ArrayObj->SecondaryColor;
+ aa->offset = SecondaryColorFuncs[TYPE_IDX(aa->array->Type)];
aa++;
}
- if (ctx->Array.FogCoord.Enabled) {
- aa->array = &ctx->Array.FogCoord;
- aa->func = FogCoordFuncs[TYPE_IDX(aa->array->Type)];
+ if (ctx->Array.ArrayObj->FogCoord.Enabled) {
+ aa->array = &ctx->Array.ArrayObj->FogCoord;
+ aa->offset = FogCoordFuncs[TYPE_IDX(aa->array->Type)];
aa++;
}
for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
- if (ctx->Array.TexCoord[i].Enabled) {
- /* NOTE: we use generic glVertexAttrib functions here.
- * If we ever de-alias conventional/generic vertex attribs this
- * will have to change.
+ struct gl_client_array *attribArray = &ctx->Array.ArrayObj->TexCoord[i];
+ if (attribArray->Enabled) {
+ /* NOTE: we use generic glVertexAttribNV functions here.
+ * If we ever remove GL_NV_vertex_program this will have to change.
*/
- struct gl_client_array *attribArray = &ctx->Array.TexCoord[i];
at->array = attribArray;
- at->func = AttribFuncs[at->array->Normalized][at->array->Size-1][TYPE_IDX(at->array->Type)];
+ ASSERT(!at->array->Normalized);
+ at->func = AttribFuncsNV[at->array->Normalized]
+ [at->array->Size-1]
+ [TYPE_IDX(at->array->Type)];
at->index = VERT_ATTRIB_TEX0 + i;
at++;
}
/* generic vertex attribute arrays */
for (i = 1; i < VERT_ATTRIB_MAX; i++) { /* skip zero! */
- if (ctx->Array.VertexAttrib[i].Enabled) {
- struct gl_client_array *attribArray = &ctx->Array.VertexAttrib[i];
+ struct gl_client_array *attribArray = &ctx->Array.ArrayObj->VertexAttrib[i];
+ if (attribArray->Enabled) {
at->array = attribArray;
/* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV
* function pointer here (for float arrays) since the pointer may
* change from one execution of _ae_loopback_array_elt() to
* the next. Doing so caused UT to break.
*/
- at->func = AttribFuncs[at->array->Normalized][at->array->Size-1][TYPE_IDX(at->array->Type)];
+ if (ctx->VertexProgram._Enabled
+ && ctx->VertexProgram.Current->IsNVProgram) {
+ at->func = AttribFuncsNV[at->array->Normalized]
+ [at->array->Size-1]
+ [TYPE_IDX(at->array->Type)];
+ }
+ else {
+ at->func = AttribFuncsARB[at->array->Normalized]
+ [at->array->Size-1]
+ [TYPE_IDX(at->array->Type)];
+ }
at->index = i;
at++;
}
}
/* finally, vertex position */
- if (ctx->Array.VertexAttrib[0].Enabled) {
+ if (ctx->Array.ArrayObj->VertexAttrib[0].Enabled) {
/* Use glVertex(v) instead of glVertexAttrib(0, v) to be sure it's
- * issued as the last (proviking) attribute).
+ * issued as the last (provoking) attribute).
*/
- aa->array = &ctx->Array.VertexAttrib[0];
+ aa->array = &ctx->Array.ArrayObj->VertexAttrib[0];
assert(aa->array->Size >= 2); /* XXX fix someday? */
- aa->func = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
+ aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
aa++;
}
- else if (ctx->Array.Vertex.Enabled) {
- aa->array = &ctx->Array.Vertex;
- aa->func = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
+ else if (ctx->Array.ArrayObj->Vertex.Enabled) {
+ aa->array = &ctx->Array.ArrayObj->Vertex;
+ aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
aa++;
}
ASSERT(at - actx->attribs <= VERT_ATTRIB_MAX);
ASSERT(aa - actx->arrays < 32);
at->func = NULL; /* terminate the list */
- aa->func = NULL; /* terminate the list */
+ aa->offset = -1; /* terminate the list */
actx->NewState = 0;
}
const AEcontext *actx = AE_CONTEXT(ctx);
const AEarray *aa;
const AEattrib *at;
+ const struct _glapi_table * const disp = GET_DISPATCH();
+
if (actx->NewState)
_ae_update_state( ctx );
/* generic attributes */
for (at = actx->attribs; at->func; at++) {
- const GLubyte *src = at->array->BufferObj->Data
- + (unsigned long) at->array->Ptr
- + elt * at->array->StrideB;
+ const GLubyte *src
+ = ADD_POINTERS(at->array->BufferObj->Data, at->array->Ptr)
+ + elt * at->array->StrideB;
at->func( at->index, src );
}
/* conventional arrays */
- for (aa = actx->arrays; aa->func ; aa++) {
- const GLubyte *src = aa->array->BufferObj->Data
- + (unsigned long) aa->array->Ptr
- + elt * aa->array->StrideB;
- aa->func( src );
+ for (aa = actx->arrays; aa->offset != -1 ; aa++) {
+ const GLubyte *src
+ = ADD_POINTERS(aa->array->BufferObj->Data, aa->array->Ptr)
+ + elt * aa->array->StrideB;
+ CALL_by_offset( disp, (array_func), aa->offset,
+ ((const void *) src) );
}
}
-
void _ae_invalidate_state( GLcontext *ctx, GLuint new_state )
{
AE_CONTEXT(ctx)->NewState |= new_state;
projects / mesa.git / blobdiff