From 0f365b2d77e35391283998dbf1311a4aae3cc760 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 1 May 2013 19:15:33 -0600 Subject: mesa: remove GLvertexformat::Rectf() As with the glDraw* functions, this doesn't have to be in GLvertexformat. Reviewed-by: Jose Fonseca --- src/mesa/vbo/vbo_save_api.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/mesa/vbo/vbo_save_api.c') diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index a174ded2d29..4d9a6366a58 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -993,18 +993,6 @@ _save_End(void) } -static void GLAPIENTRY -_save_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) -{ - GET_CURRENT_CONTEXT(ctx); - (void) x1; - (void) y1; - (void) x2; - (void) y2; - _mesa_compile_error(ctx, GL_INVALID_OPERATION, "glRectf"); -} - - static void GLAPIENTRY _save_EvalMesh1(GLenum mode, GLint i1, GLint i2) { @@ -1378,7 +1366,6 @@ _save_vtxfmt_init(struct gl_context *ctx) * only used when we're inside a glBegin/End pair. */ vfmt->Begin = _save_Begin; - vfmt->Rectf = _save_Rectf; } @@ -1395,6 +1382,7 @@ vbo_initialize_save_dispatch(const struct gl_context *ctx, SET_DrawRangeElements(exec, _save_OBE_DrawRangeElements); SET_MultiDrawElementsEXT(exec, _save_OBE_MultiDrawElements); SET_MultiDrawElementsBaseVertex(exec, _save_OBE_MultiDrawElementsBaseVertex); + SET_Rectf(exec, _save_OBE_Rectf); /* Note: other glDraw functins aren't compiled into display lists */ } @@ -1589,9 +1577,4 @@ vbo_save_api_init(struct vbo_save_context *save) /* These will actually get set again when binding/drawing */ for (i = 0; i < VBO_ATTRIB_MAX; i++) save->inputs[i] = &save->arrays[i]; - - /* Hook our array functions into the outside-begin-end vtxfmt in - * ctx->ListState. - */ - ctx->ListState.ListVtxfmt.Rectf = _save_OBE_Rectf; } -- cgit v1.2.3