diff options
| author | Brian Paul <[email protected]> | 2013-05-01 19:15:32 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-05-02 09:03:15 -0600 |
| commit | 43b3d3bc25e63e02b0335c3ce165fb40001906ca (patch) | |
| tree | eeff3bff6234a3c5ebdff4b036b2c23604886835 | |
| parent | 95188fd10f9626fa1045911182e8b2f7b951413f (diff) | |
mesa: remove _MESA_INIT_ARRAYELT_VTXFMT() macro
Reviewed-by: Jose Fonseca <[email protected]>
| -rw-r--r-- | src/mesa/main/api_arrayelt.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/dlist.c | 2 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 2 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_noop.c | 2 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_save_api.c | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h index 61e2167f3e6..e250cb4c819 100644 --- a/src/mesa/main/api_arrayelt.h +++ b/src/mesa/main/api_arrayelt.h @@ -31,10 +31,6 @@ #include "main/mtypes.h" -#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) \ - do { \ - (vfmt)->ArrayElement = impl ## ArrayElement; \ - } while (0) extern GLboolean _ae_create_context( struct gl_context *ctx ); extern void _ae_destroy_context( struct gl_context *ctx ); diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index cfe612d9255..900894739d8 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -9554,7 +9554,7 @@ mesa_print_display_list(GLuint list) static void save_vtxfmt_init(GLvertexformat * vfmt) { - _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_); + vfmt->ArrayElement = _ae_ArrayElement; vfmt->Begin = save_Begin; diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index e6787c7e494..be7e74c2531 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -910,7 +910,7 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec ) struct gl_context *ctx = exec->ctx; GLvertexformat *vfmt = &exec->vtxfmt; - _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_); + vfmt->ArrayElement = _ae_ArrayElement; vfmt->Begin = vbo_exec_Begin; vfmt->End = vbo_exec_End; diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c index ec8be137685..4b7aa5d0866 100644 --- a/src/mesa/vbo/vbo_noop.c +++ b/src/mesa/vbo/vbo_noop.c @@ -422,7 +422,7 @@ _mesa_noop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) void _mesa_noop_vtxfmt_init(GLvertexformat * vfmt) { - _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_); + vfmt->ArrayElement = _ae_ArrayElement; vfmt->Begin = _mesa_noop_Begin; diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index 94dc69dec33..0160e831cbd 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -1394,7 +1394,7 @@ _save_vtxfmt_init(struct gl_context *ctx) struct vbo_save_context *save = &vbo_context(ctx)->save; GLvertexformat *vfmt = &save->vtxfmt; - _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_); + vfmt->ArrayElement = _ae_ArrayElement; vfmt->Color3f = _save_Color3f; vfmt->Color3fv = _save_Color3fv; |