-/* $Id: api_arrayelt.c,v 1.2 2001/03/12 00:48:37 gareth Exp $ */
+/* $Id: api_arrayelt.c,v 1.6 2002/01/14 16:06:35 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 4.1
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2002 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"),
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+/* Author:
+ * Keith Whitwell <keith_whitwell@yahoo.com>
+ */
+
#include "glheader.h"
-#include "api_noop.h"
+#include "api_arrayelt.h"
#include "context.h"
-#include "colormac.h"
-#include "light.h"
+#include "glapi.h"
+#include "mem.h"
#include "macros.h"
-#include "mmath.h"
#include "mtypes.h"
+typedef void (*texarray_func)( GLenum, const void * );
+
typedef struct {
GLint unit;
struct gl_client_array *array;
- void *func;
-} AAtexarray;
+ texarray_func func;
+} AEtexarray;
+typedef void (*array_func)( const void * );
typedef struct {
struct gl_client_array *array;
- void *func;
-} AAarray;
+ array_func func;
+} AEarray;
typedef struct {
- AAtexarray texarrays[MAX_TEXTURE_UNITS+1];
- AAarray arrays[10];
+ AEtexarray texarrays[MAX_TEXTURE_UNITS+1];
+ AEarray arrays[32];
GLuint NewState;
-} AAcontext;
-
-
-static void *colorfuncs[2][7] = {
- { glColor3bv,
- glColor3ub,
- glColor3sv,
- glColor3usv,
- glColor3iv,
- glColor3fv,
- glColor3dv },
-
- { glColor4bv,
- glColor4ub,
- glColor4sv,
- glColor4usv,
- glColor4iv,
- glColor4fv,
- glColor4dv }
+} AEcontext;
+
+#define AE_CONTEXT(ctx) ((AEcontext *)(ctx)->aelt_context)
+#define TYPE_IDX(t) ((t) & 0xf)
+
+static void (*colorfuncs[2][8])( const void * ) = {
+ { (array_func)glColor3bv,
+ (array_func)glColor3ub,
+ (array_func)glColor3sv,
+ (array_func)glColor3usv,
+ (array_func)glColor3iv,
+ (array_func)glColor3uiv,
+ (array_func)glColor3fv,
+ (array_func)glColor3dv },
+
+ { (array_func)glColor4bv,
+ (array_func)glColor4ub,
+ (array_func)glColor4sv,
+ (array_func)glColor4usv,
+ (array_func)glColor4iv,
+ (array_func)glColor4uiv,
+ (array_func)glColor4fv,
+ (array_func)glColor4dv }
};
-static void *vertexfuncs[3][7] = {
- { glVertex3bv,
- glVertex3ub,
- glVertex3sv,
- glVertex3usv,
- glVertex3iv,
- glVertex3fv,
- glVertex3dv },
-
- { glVertex3bv,
- glVertex3ub,
- glVertex3sv,
- glVertex3usv,
- glVertex3iv,
- glVertex3fv,
- glVertex3dv },
-
- { glVertex4bv,
- glVertex4ub,
- glVertex4sv,
- glVertex4usv,
- glVertex4iv,
- glVertex4fv,
- glVertex4dv }
+static void (*vertexfuncs[3][8])( const void * ) = {
+ { 0,
+ 0,
+ (array_func)glVertex2sv,
+ 0,
+ (array_func)glVertex2iv,
+ 0,
+ (array_func)glVertex2fv,
+ (array_func)glVertex2dv },
+
+ { 0,
+ 0,
+ (array_func)glVertex3sv,
+ 0,
+ (array_func)glVertex3iv,
+ 0,
+ (array_func)glVertex3fv,
+ (array_func)glVertex3dv },
+
+ { 0,
+ 0,
+ (array_func)glVertex4sv,
+ 0,
+ (array_func)glVertex4iv,
+ 0,
+ (array_func)glVertex4fv,
+ (array_func)glVertex4dv }
};
-static void *multitexfuncs[4][7] = {
- { glMultiTexCoord1bv,
- glMultiTexCoord1ub,
- glMultiTexCoord1sv,
- glMultiTexCoord1usv,
- glMultiTexCoord1iv,
- glMultiTexCoord1fv,
- glMultiTexCoord1dv },
-
- { glMultiTexCoord2bv,
- glMultiTexCoord2ub,
- glMultiTexCoord2sv,
- glMultiTexCoord2usv,
- glMultiTexCoord2iv,
- glMultiTexCoord2fv,
- glMultiTexCoord2dv },
-
- { glMultiTexCoord3bv,
- glMultiTexCoord3ub,
- glMultiTexCoord3sv,
- glMultiTexCoord3usv,
- glMultiTexCoord3iv,
- glMultiTexCoord3fv,
- glMultiTexCoord3dv },
-
- { glMultiTexCoord4bv,
- glMultiTexCoord4ub,
- glMultiTexCoord4sv,
- glMultiTexCoord4usv,
- glMultiTexCoord4iv,
- glMultiTexCoord4fv,
- glMultiTexCoord4dv }
+static void (*multitexfuncs[4][8])( GLenum, const void * ) = {
+ { 0,
+ 0,
+ (texarray_func)glMultiTexCoord1svARB,
+ 0,
+ (texarray_func)glMultiTexCoord1ivARB,
+ 0,
+ (texarray_func)glMultiTexCoord1fvARB,
+ (texarray_func)glMultiTexCoord1dvARB },
+
+ { 0,
+ 0,
+ (texarray_func)glMultiTexCoord2svARB,
+ 0,
+ (texarray_func)glMultiTexCoord2ivARB,
+ 0,
+ (texarray_func)glMultiTexCoord2fvARB,
+ (texarray_func)glMultiTexCoord2dvARB },
+
+ { 0,
+ 0,
+ (texarray_func)glMultiTexCoord3svARB,
+ 0,
+ (texarray_func)glMultiTexCoord3ivARB,
+ 0,
+ (texarray_func)glMultiTexCoord3fvARB,
+ (texarray_func)glMultiTexCoord3dvARB },
+
+ { 0,
+ 0,
+ (texarray_func)glMultiTexCoord4svARB,
+ 0,
+ (texarray_func)glMultiTexCoord4ivARB,
+ 0,
+ (texarray_func)glMultiTexCoord4fvARB,
+ (texarray_func)glMultiTexCoord4dvARB }
};
-static void *indexfuncs[7] = {
- { glIndexbv,
- glIndexub,
- glIndexsv,
- glIndexusv,
- glIndexiv,
- glIndexfv,
- glIndexdv },
+static void (*indexfuncs[8])( const void * ) = {
+ 0,
+ (array_func)glIndexubv,
+ (array_func)glIndexsv,
+ 0,
+ (array_func)glIndexiv,
+ 0,
+ (array_func)glIndexfv,
+ (array_func)glIndexdv
};
-static void *edgeflagfuncs[7] = {
- { glEdgeFlagbv,
- glEdgeFlagub,
- glEdgeFlagsv,
- glEdgeFlagusv,
- glEdgeFlagiv,
- glEdgeFlagfv,
- glEdgeFlagdv },
-};
-static void *normalfuncs[7] = {
- { glNormal3bv,
- glNormal3ub,
- glNormal3sv,
- glNormal3usv,
- glNormal3iv,
- glNormal3fv,
- glNormal3dv },
+static void (*normalfuncs[8])( const void * ) = {
+ (array_func)glNormal3bv,
+ 0,
+ (array_func)glNormal3sv,
+ 0,
+ (array_func)glNormal3iv,
+ 0,
+ (array_func)glNormal3fv,
+ (array_func)glNormal3dv,
};
-static void *fogcoordfuncs[7] = {
- { glFogCoordbv,
- glFogCoordub,
- glFogCoordsv,
- glFogCoordusv,
- glFogCoordiv,
- glFogCoordfv,
- glFogCoorddv },
+
+/* Wrapper functions in case glSecondaryColor*EXT doesn't exist */
+static void SecondaryColor3bvEXT(const GLbyte *c)
+{
+ _glapi_Dispatch->SecondaryColor3bvEXT(c);
+}
+
+static void SecondaryColor3ubvEXT(const GLubyte *c)
+{
+ _glapi_Dispatch->SecondaryColor3ubvEXT(c);
+}
+
+static void SecondaryColor3svEXT(const GLshort *c)
+{
+ _glapi_Dispatch->SecondaryColor3svEXT(c);
+}
+
+static void SecondaryColor3usvEXT(const GLushort *c)
+{
+ _glapi_Dispatch->SecondaryColor3usvEXT(c);
+}
+
+static void SecondaryColor3ivEXT(const GLint *c)
+{
+ _glapi_Dispatch->SecondaryColor3ivEXT(c);
+}
+
+static void SecondaryColor3uivEXT(const GLuint *c)
+{
+ _glapi_Dispatch->SecondaryColor3uivEXT(c);
+}
+
+static void SecondaryColor3fvEXT(const GLfloat *c)
+{
+ _glapi_Dispatch->SecondaryColor3fvEXT(c);
+}
+
+static void SecondaryColor3dvEXT(const GLdouble *c)
+{
+ _glapi_Dispatch->SecondaryColor3dvEXT(c);
+}
+
+static void (*secondarycolorfuncs[8])( const void * ) = {
+ (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 *secondarycolorfuncs[7] = {
- { glSecondaryColor3bv,
- glSecondaryColor3ub,
- glSecondaryColor3sv,
- glSecondaryColor3usv,
- glSecondaryColor3iv,
- glSecondaryColor3fv,
- glSecondaryColor3dv },
+
+/* Again, wrapper functions in case glSecondaryColor*EXT doesn't exist */
+static void FogCoordfvEXT(const GLfloat *f)
+{
+ _glapi_Dispatch->FogCoordfvEXT(f);
+}
+
+static void FogCoorddvEXT(const GLdouble *f)
+{
+ _glapi_Dispatch->FogCoorddvEXT(f);
+}
+
+static void (*fogcoordfuncs[8])( const void * ) = {
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ (array_func) FogCoordfvEXT,
+ (array_func) FogCoorddvEXT
};
-void _aa_create_context( GLcontext *ctx )
+
+GLboolean _ae_create_context( GLcontext *ctx )
+{
+ ctx->aelt_context = MALLOC( sizeof(AEcontext) );
+ if (!ctx->aelt_context)
+ return GL_FALSE;
+
+ AE_CONTEXT(ctx)->NewState = ~0;
+ return GL_TRUE;
+}
+
+
+void _ae_destroy_context( GLcontext *ctx )
{
- ctx->aa_context = MALLOC( sizeof(AAcontext) );
- AA_CONTEXT(ctx)->NewState = ~0;
+ if ( AE_CONTEXT( ctx ) ) {
+ FREE( ctx->aelt_context );
+ ctx->aelt_context = 0;
+ }
}
-static void _aa_update_state( GLcontext *ctx )
+
+static void _ae_update_state( GLcontext *ctx )
{
- AAcontext *actx = AA_CONTEXT(ctx);
- AAtexarray *ta = actx->texarrays;
- AAarray *aa = actx->arrays;
+ AEcontext *actx = AE_CONTEXT(ctx);
+ AEtexarray *ta = actx->texarrays;
+ AEarray *aa = actx->arrays;
int i;
for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++)
}
if (ctx->Array.EdgeFlag.Enabled) {
- aa->array = &ctx->Array.Edgeflag;
- aa->func = edgeflagfuncs[TYPE_IDX(aa->array->Type)];
+ aa->array = &ctx->Array.EdgeFlag;
+ aa->func = (array_func)glEdgeFlagv;
aa++;
}
if (ctx->Array.FogCoord.Enabled) {
- aa->array = &ctx->Array.Fogcoord;
+ aa->array = &ctx->Array.FogCoord;
aa->func = fogcoordfuncs[TYPE_IDX(aa->array->Type)];
aa++;
}
}
-static void _aa_loopback_array_elt( GLint elt )
+void _ae_loopback_array_elt( GLint elt )
{
GET_CURRENT_CONTEXT(ctx);
- AAcontext *actx = AA_CONTEXT(ctx);
- AAtexarray *ta;
- AAarray *aa;
+ AEcontext *actx = AE_CONTEXT(ctx);
+ AEtexarray *ta;
+ AEarray *aa;
+
+ if (actx->NewState)
+ _ae_update_state( ctx );
for (ta = actx->texarrays ; ta->func ; ta++) {
- void (*func)( GLint, const void * ) =
- (void (*)( GLint, const void * )) ta->func;
- func( ta->unit, (char *)ta->array->Ptr + elt * ta->array->SizeB );
+ ta->func( ta->unit, (char *)ta->array->Ptr + elt * ta->array->StrideB );
}
+ /* Must be last
+ */
for (aa = actx->arrays ; aa->func ; aa++) {
- void (*func)( GLint, const void * ) =
- (void (*)( GLint, const void * )) aa->func;
- func( (char *)aa->array->Ptr + elt * aa->array->SizeB );
+ aa->func( (char *)aa->array->Ptr + elt * aa->array->StrideB );
}
}
-void _aa_exec_array_elt( GLint elt )
-{
- GET_CURRENT_CONTEXT(ctx);
- AAcontext *actx = AA_CONTEXT(ctx);
-
- if (actx->NewState)
- _aa_update_state( ctx );
-
- ctx->Exec->ArrayElement = _aa_loopback_array_elt;
- _aa_loopback_array_elt( elt );
-}
-
-/* This works for save as well:
- */
-void _aa_save_array_elt( GLint elt )
-{
- GET_CURRENT_CONTEXT(ctx);
- AAcontext *actx = AA_CONTEXT(ctx);
-
- if (actx->NewState)
- _aa_update_state( ctx );
-
- ctx->Save->ArrayElement = _aa_loopback_array_elt;
- _aa_loopback_array_elt( elt );
-}
-
-void aa_invalidate_state( GLcontext *ctx, GLuint new_state )
+void _ae_invalidate_state( GLcontext *ctx, GLuint new_state )
{
- if (AA_CONTEXT(ctx))
- AA_CONTEXT(ctx)->NewState |= new_state;
+ AE_CONTEXT(ctx)->NewState |= new_state;
}
projects / mesa.git / blobdiff