From 3538f81513389b75cbd9e9b04a3723ce9c15b497 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 20 Apr 2006 02:16:55 +0000 Subject: Make most of the _mesa_noop_*() functions static. Generate GL_INVALID_VALUE, not GL_INVALID_ENUM when glVertexAttrib is called with a bad index. Use _mesa_noop_vtxfmt_init() in DRI drivers to initialize vertex format struct. --- src/mesa/drivers/dri/ffb/ffb_vtxfmt.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/mesa/drivers/dri/ffb') diff --git a/src/mesa/drivers/dri/ffb/ffb_vtxfmt.c b/src/mesa/drivers/dri/ffb/ffb_vtxfmt.c index d6a61d98e5..9c1b770fbd 100644 --- a/src/mesa/drivers/dri/ffb/ffb_vtxfmt.c +++ b/src/mesa/drivers/dri/ffb/ffb_vtxfmt.c @@ -341,7 +341,8 @@ void ffbInitTnlModule(GLcontext *ctx) ffb_init_norm_funcs(); ffb_init_vert_funcs(); - MEMSET(vfmt, 0, sizeof(GLvertexformat)); + /* start by initializing to no-op functions */ + _mesa_noop_vtxfmt_init(vfmt); /* Handled fully in supported states: */ vfmt->ArrayElement = NULL; /* FIXME: ... */ @@ -389,18 +390,8 @@ void ffbInitTnlModule(GLcontext *ctx) vfmt->Begin = ffb_Begin; vfmt->End = ffb_End; - vfmt->Rectf = _mesa_noop_Rectf; /* generic helper */ - vfmt->DrawArrays = NULL; vfmt->DrawElements = NULL; - vfmt->DrawRangeElements = _mesa_noop_DrawRangeElements; /* discard range */ - - - /* Not active in supported states; just keep ctx->Current uptodate: */ - vfmt->EdgeFlag = _mesa_noop_EdgeFlag; - vfmt->EdgeFlagv = _mesa_noop_EdgeFlagv; - vfmt->Indexi = _mesa_noop_Indexi; - vfmt->Indexiv = _mesa_noop_Indexiv; /* Active but unsupported -- fallback if we receive these: * -- cgit v1.2.3