diff options
| author | Brian Paul <[email protected]> | 2013-05-01 19:15:33 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-05-02 09:03:16 -0600 |
| commit | 0f365b2d77e35391283998dbf1311a4aae3cc760 (patch) | |
| tree | 6b19a8b507784b6c6cef3fd3240657fe842ff54e /src/mesa/main | |
| parent | 49993a1a9dc34b78ccd345b91087385917a40138 (diff) | |
mesa: remove GLvertexformat::Rectf()
As with the glDraw* functions, this doesn't have to be in GLvertexformat.
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dd.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/dlist.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/vtxfmt.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index c5d7ad419c5..e3240a26f8f 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -1022,8 +1022,6 @@ typedef struct { /*@}*/ - void (GLAPIENTRYP Rectf)( GLfloat, GLfloat, GLfloat, GLfloat ); - /** * \name Eval * diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 18c05f0615b..ae2a5529606 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -5703,7 +5703,7 @@ save_Rectf(GLfloat a, GLfloat b, GLfloat c, GLfloat d) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES(ctx); + ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); n = alloc_instruction(ctx, OPCODE_RECTF, 4); if (n) { n[1].f = a; @@ -8935,6 +8935,7 @@ _mesa_initialize_save_table(const struct gl_context *ctx) SET_RasterPos4s(table, save_RasterPos4s); SET_RasterPos4sv(table, save_RasterPos4sv); SET_ReadBuffer(table, save_ReadBuffer); + SET_Rectf(table, save_Rectf); SET_Rotated(table, save_Rotated); SET_Rotatef(table, save_Rotatef); SET_Scaled(table, save_Scaled); @@ -9633,8 +9634,6 @@ save_vtxfmt_init(GLvertexformat * vfmt) vfmt->VertexAttrib3fvARB = save_VertexAttrib3fvARB; vfmt->VertexAttrib4fARB = save_VertexAttrib4fARB; vfmt->VertexAttrib4fvARB = save_VertexAttrib4fvARB; - - vfmt->Rectf = save_Rectf; } diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index db389a573f9..3a0e7d357ee 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -112,8 +112,6 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab, SET_Begin(tab, vfmt->Begin); SET_End(tab, vfmt->End); SET_PrimitiveRestartNV(tab, vfmt->PrimitiveRestartNV); - - SET_Rectf(tab, vfmt->Rectf); } /* Originally for GL_NV_vertex_program, this is also used by dlist.c */ |