diff options
| author | Brian Paul <[email protected]> | 2013-05-01 19:15:33 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-05-02 09:03:15 -0600 |
| commit | d0102500bdc123984a2cfc95d4f2710f8c90e898 (patch) | |
| tree | 9d738b87067c41dd30bd096dfa28ae438a4de9c8 /src/mesa/vbo | |
| parent | 43b3d3bc25e63e02b0335c3ce165fb40001906ca (diff) | |
mesa: remove _MESA_INIT_EVAL_VTXFMT() macro
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 9 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_noop.c | 9 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_save_api.c | 9 |
3 files changed, 24 insertions, 3 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index be7e74c2531..5fac363e4a9 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -919,7 +919,14 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec ) vfmt->CallList = _mesa_CallList; vfmt->CallLists = _mesa_CallLists; - _MESA_INIT_EVAL_VTXFMT(vfmt, vbo_exec_); + vfmt->EvalCoord1f = vbo_exec_EvalCoord1f; + vfmt->EvalCoord1fv = vbo_exec_EvalCoord1fv; + vfmt->EvalCoord2f = vbo_exec_EvalCoord2f; + vfmt->EvalCoord2fv = vbo_exec_EvalCoord2fv; + vfmt->EvalPoint1 = vbo_exec_EvalPoint1; + vfmt->EvalPoint2 = vbo_exec_EvalPoint2; + vfmt->EvalMesh1 = vbo_exec_EvalMesh1; + vfmt->EvalMesh2 = vbo_exec_EvalMesh2; vfmt->Rectf = vbo_exec_Rectf; diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c index 4b7aa5d0866..bc43bc9e63c 100644 --- a/src/mesa/vbo/vbo_noop.c +++ b/src/mesa/vbo/vbo_noop.c @@ -438,7 +438,14 @@ _mesa_noop_vtxfmt_init(GLvertexformat * vfmt) vfmt->PrimitiveRestartNV = _mesa_noop_PrimitiveRestartNV; - _MESA_INIT_EVAL_VTXFMT(vfmt, _mesa_noop_); + vfmt->EvalCoord1f = _mesa_noop_EvalCoord1f; + vfmt->EvalCoord1fv = _mesa_noop_EvalCoord1fv; + vfmt->EvalCoord2f = _mesa_noop_EvalCoord2f; + vfmt->EvalCoord2fv = _mesa_noop_EvalCoord2fv; + vfmt->EvalPoint1 = _mesa_noop_EvalPoint1; + vfmt->EvalPoint2 = _mesa_noop_EvalPoint2; + vfmt->EvalMesh1 = _mesa_noop_EvalMesh1; + vfmt->EvalMesh2 = _mesa_noop_EvalMesh2; vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT; vfmt->FogCoordfvEXT = _mesa_noop_FogCoordfvEXT; diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index 0160e831cbd..f7beab79727 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -1521,7 +1521,14 @@ _save_vtxfmt_init(struct gl_context *ctx) vfmt->CallList = _save_CallList; vfmt->CallLists = _save_CallLists; - _MESA_INIT_EVAL_VTXFMT(vfmt, _save_); + vfmt->EvalCoord1f = _save_EvalCoord1f; + vfmt->EvalCoord1fv = _save_EvalCoord1fv; + vfmt->EvalCoord2f = _save_EvalCoord2f; + vfmt->EvalCoord2fv = _save_EvalCoord2fv; + vfmt->EvalPoint1 = _save_EvalPoint1; + vfmt->EvalPoint2 = _save_EvalPoint2; + vfmt->EvalMesh1 = _save_EvalMesh1; + vfmt->EvalMesh2 = _save_EvalMesh2; /* These calls all generate GL_INVALID_OPERATION since this vtxfmt is * only used when we're inside a glBegin/End pair. |