-/* $Id: vtxfmt.c,v 1.14 2002/10/29 20:28:56 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 6.3
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 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 "api_loopback.h"
#include "context.h"
#include "imports.h"
#include "mtypes.h"
#include "state.h"
#include "vtxfmt.h"
+#include "eval.h"
+#include "dlist.h"
+
+
+#if FEATURE_beginend
/* The neutral vertex format. This wraps all tnl module functions,
#define PRE_LOOPBACK( FUNC ) \
{ \
GET_CURRENT_CONTEXT(ctx); \
- struct gl_tnl_module *tnl = &(ctx->TnlModule); \
+ struct gl_tnl_module * const tnl = &(ctx->TnlModule); \
+ const int tmp_offset = _gloffset_ ## FUNC ; \
\
ASSERT( tnl->Current ); \
ASSERT( tnl->SwapCount < NUM_VERTEX_FORMAT_ENTRIES ); \
- \
- /* Save the swapped function's dispatch entry so it can be */ \
- /* restored later. */ \
- tnl->Swapped[tnl->SwapCount][0] = (void *)&(ctx->Exec->FUNC); \
- tnl->Swapped[tnl->SwapCount][1] = (void *)TAG(FUNC); \
+ ASSERT( tmp_offset >= 0 ); \
+ \
+ if (tnl->SwapCount == 0) \
+ ctx->Driver.BeginVertices( ctx ); \
+ \
+ /* Save the swapped function's dispatch entry so it can be */ \
+ /* restored later. */ \
+ tnl->Swapped[tnl->SwapCount].location = & (((_glapi_proc *)ctx->Exec)[tmp_offset]); \
+ tnl->Swapped[tnl->SwapCount].function = (_glapi_proc)TAG(FUNC); \
tnl->SwapCount++; \
\
if ( 0 ) \
_mesa_debug(ctx, " swapping gl" #FUNC"...\n" ); \
\
/* Install the tnl function pointer. */ \
- ctx->Exec->FUNC = tnl->Current->FUNC; \
+ SET_ ## FUNC(ctx->Exec, tnl->Current->FUNC); \
}
#define TAG(x) neutral_##x
#include "vtxfmt_tmp.h"
-
-static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt )
+/**
+ * Use the per-vertex functions found in <vfmt> to initialze the given
+ * API dispatch table.
+ */
+static void
+install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
{
- tab->ArrayElement = vfmt->ArrayElement;
- tab->Color3f = vfmt->Color3f;
- tab->Color3fv = vfmt->Color3fv;
- tab->Color3ub = vfmt->Color3ub;
- tab->Color3ubv = vfmt->Color3ubv;
- tab->Color4f = vfmt->Color4f;
- tab->Color4fv = vfmt->Color4fv;
- tab->Color4ub = vfmt->Color4ub;
- tab->Color4ubv = vfmt->Color4ubv;
- tab->EdgeFlag = vfmt->EdgeFlag;
- tab->EdgeFlagv = vfmt->EdgeFlagv;
- tab->EvalCoord1f = vfmt->EvalCoord1f;
- tab->EvalCoord1fv = vfmt->EvalCoord1fv;
- tab->EvalCoord2f = vfmt->EvalCoord2f;
- tab->EvalCoord2fv = vfmt->EvalCoord2fv;
- tab->EvalPoint1 = vfmt->EvalPoint1;
- tab->EvalPoint2 = vfmt->EvalPoint2;
- tab->FogCoordfEXT = vfmt->FogCoordfEXT;
- tab->FogCoordfvEXT = vfmt->FogCoordfvEXT;
- tab->Indexi = vfmt->Indexi;
- tab->Indexiv = vfmt->Indexiv;
- tab->Materialfv = vfmt->Materialfv;
- tab->MultiTexCoord1fARB = vfmt->MultiTexCoord1fARB;
- tab->MultiTexCoord1fvARB = vfmt->MultiTexCoord1fvARB;
- tab->MultiTexCoord2fARB = vfmt->MultiTexCoord2fARB;
- tab->MultiTexCoord2fvARB = vfmt->MultiTexCoord2fvARB;
- tab->MultiTexCoord3fARB = vfmt->MultiTexCoord3fARB;
- tab->MultiTexCoord3fvARB = vfmt->MultiTexCoord3fvARB;
- tab->MultiTexCoord4fARB = vfmt->MultiTexCoord4fARB;
- tab->MultiTexCoord4fvARB = vfmt->MultiTexCoord4fvARB;
- tab->Normal3f = vfmt->Normal3f;
- tab->Normal3fv = vfmt->Normal3fv;
- tab->SecondaryColor3fEXT = vfmt->SecondaryColor3fEXT;
- tab->SecondaryColor3fvEXT = vfmt->SecondaryColor3fvEXT;
- tab->SecondaryColor3ubEXT = vfmt->SecondaryColor3ubEXT;
- tab->SecondaryColor3ubvEXT = vfmt->SecondaryColor3ubvEXT;
- tab->TexCoord1f = vfmt->TexCoord1f;
- tab->TexCoord1fv = vfmt->TexCoord1fv;
- tab->TexCoord2f = vfmt->TexCoord2f;
- tab->TexCoord2fv = vfmt->TexCoord2fv;
- tab->TexCoord3f = vfmt->TexCoord3f;
- tab->TexCoord3fv = vfmt->TexCoord3fv;
- tab->TexCoord4f = vfmt->TexCoord4f;
- tab->TexCoord4fv = vfmt->TexCoord4fv;
- tab->Vertex2f = vfmt->Vertex2f;
- tab->Vertex2fv = vfmt->Vertex2fv;
- tab->Vertex3f = vfmt->Vertex3f;
- tab->Vertex3fv = vfmt->Vertex3fv;
- tab->Vertex4f = vfmt->Vertex4f;
- tab->Vertex4fv = vfmt->Vertex4fv;
- tab->CallList = vfmt->CallList;
- tab->Begin = vfmt->Begin;
- tab->End = vfmt->End;
- tab->VertexAttrib4fNV = vfmt->VertexAttrib4fNV;
- tab->Rectf = vfmt->Rectf;
- tab->DrawArrays = vfmt->DrawArrays;
- tab->DrawElements = vfmt->DrawElements;
- tab->DrawRangeElements = vfmt->DrawRangeElements;
- tab->EvalMesh1 = vfmt->EvalMesh1;
- tab->EvalMesh2 = vfmt->EvalMesh2;
- assert(tab->EvalMesh2);
+ _mesa_install_arrayelt_vtxfmt(tab, vfmt);
+
+ SET_Color3f(tab, vfmt->Color3f);
+ SET_Color3fv(tab, vfmt->Color3fv);
+ SET_Color4f(tab, vfmt->Color4f);
+ SET_Color4fv(tab, vfmt->Color4fv);
+ SET_EdgeFlag(tab, vfmt->EdgeFlag);
+
+ _mesa_install_eval_vtxfmt(tab, vfmt);
+
+ SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT);
+ SET_FogCoordfvEXT(tab, vfmt->FogCoordfvEXT);
+ SET_Indexf(tab, vfmt->Indexf);
+ SET_Indexfv(tab, vfmt->Indexfv);
+ SET_Materialfv(tab, vfmt->Materialfv);
+ SET_MultiTexCoord1fARB(tab, vfmt->MultiTexCoord1fARB);
+ SET_MultiTexCoord1fvARB(tab, vfmt->MultiTexCoord1fvARB);
+ SET_MultiTexCoord2fARB(tab, vfmt->MultiTexCoord2fARB);
+ SET_MultiTexCoord2fvARB(tab, vfmt->MultiTexCoord2fvARB);
+ SET_MultiTexCoord3fARB(tab, vfmt->MultiTexCoord3fARB);
+ SET_MultiTexCoord3fvARB(tab, vfmt->MultiTexCoord3fvARB);
+ SET_MultiTexCoord4fARB(tab, vfmt->MultiTexCoord4fARB);
+ SET_MultiTexCoord4fvARB(tab, vfmt->MultiTexCoord4fvARB);
+ SET_Normal3f(tab, vfmt->Normal3f);
+ SET_Normal3fv(tab, vfmt->Normal3fv);
+ SET_SecondaryColor3fEXT(tab, vfmt->SecondaryColor3fEXT);
+ SET_SecondaryColor3fvEXT(tab, vfmt->SecondaryColor3fvEXT);
+ SET_TexCoord1f(tab, vfmt->TexCoord1f);
+ SET_TexCoord1fv(tab, vfmt->TexCoord1fv);
+ SET_TexCoord2f(tab, vfmt->TexCoord2f);
+ SET_TexCoord2fv(tab, vfmt->TexCoord2fv);
+ SET_TexCoord3f(tab, vfmt->TexCoord3f);
+ SET_TexCoord3fv(tab, vfmt->TexCoord3fv);
+ SET_TexCoord4f(tab, vfmt->TexCoord4f);
+ SET_TexCoord4fv(tab, vfmt->TexCoord4fv);
+ SET_Vertex2f(tab, vfmt->Vertex2f);
+ SET_Vertex2fv(tab, vfmt->Vertex2fv);
+ SET_Vertex3f(tab, vfmt->Vertex3f);
+ SET_Vertex3fv(tab, vfmt->Vertex3fv);
+ SET_Vertex4f(tab, vfmt->Vertex4f);
+ SET_Vertex4fv(tab, vfmt->Vertex4fv);
+
+ _mesa_install_dlist_vtxfmt(tab, vfmt);
+
+ SET_Begin(tab, vfmt->Begin);
+ SET_End(tab, vfmt->End);
+ SET_Rectf(tab, vfmt->Rectf);
+ SET_DrawArrays(tab, vfmt->DrawArrays);
+ SET_DrawElements(tab, vfmt->DrawElements);
+ SET_DrawRangeElements(tab, vfmt->DrawRangeElements);
+ SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT);
+ SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex);
+ SET_DrawRangeElementsBaseVertex(tab, vfmt->DrawRangeElementsBaseVertex);
+ SET_MultiDrawElementsBaseVertex(tab, vfmt->MultiDrawElementsBaseVertex);
+
+ /* GL_NV_vertex_program */
+ SET_VertexAttrib1fNV(tab, vfmt->VertexAttrib1fNV);
+ SET_VertexAttrib1fvNV(tab, vfmt->VertexAttrib1fvNV);
+ SET_VertexAttrib2fNV(tab, vfmt->VertexAttrib2fNV);
+ SET_VertexAttrib2fvNV(tab, vfmt->VertexAttrib2fvNV);
+ SET_VertexAttrib3fNV(tab, vfmt->VertexAttrib3fNV);
+ SET_VertexAttrib3fvNV(tab, vfmt->VertexAttrib3fvNV);
+ SET_VertexAttrib4fNV(tab, vfmt->VertexAttrib4fNV);
+ SET_VertexAttrib4fvNV(tab, vfmt->VertexAttrib4fvNV);
+#if FEATURE_ARB_vertex_program
+ SET_VertexAttrib1fARB(tab, vfmt->VertexAttrib1fARB);
+ SET_VertexAttrib1fvARB(tab, vfmt->VertexAttrib1fvARB);
+ SET_VertexAttrib2fARB(tab, vfmt->VertexAttrib2fARB);
+ SET_VertexAttrib2fvARB(tab, vfmt->VertexAttrib2fvARB);
+ SET_VertexAttrib3fARB(tab, vfmt->VertexAttrib3fARB);
+ SET_VertexAttrib3fvARB(tab, vfmt->VertexAttrib3fvARB);
+ SET_VertexAttrib4fARB(tab, vfmt->VertexAttrib4fARB);
+ SET_VertexAttrib4fvARB(tab, vfmt->VertexAttrib4fvARB);
+#endif
}
}
-void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
{
ctx->TnlModule.Current = vfmt;
_mesa_restore_exec_vtxfmt( ctx );
- if ( ctx->ExecPrefersFloat != vfmt->prefer_float_colors )
- _mesa_loopback_prefer_float( ctx->Exec, vfmt->prefer_float_colors );
}
-void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+
+void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
{
install_vtxfmt( ctx->Save, vfmt );
- if ( ctx->SavePrefersFloat != vfmt->prefer_float_colors )
- _mesa_loopback_prefer_float( ctx->Save, vfmt->prefer_float_colors );
}
/* Restore the neutral tnl module wrapper.
*/
for ( i = 0 ; i < tnl->SwapCount ; i++ ) {
- *(void **)tnl->Swapped[i][0] = tnl->Swapped[i][1];
+ *(tnl->Swapped[i].location) = tnl->Swapped[i].function;
}
tnl->SwapCount = 0;
}
+
+
+#endif /* FEATURE_beginend */
projects / mesa.git / blobdiff