diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2021-11-28 16:56:44 -0500 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2021-12-14 11:59:55 -0500 |
| commit | 31baf7bc4d681b5eb970dd2e6e5100ad4eb291db (patch) | |
| tree | 3dcb4d2497995b9d03d28bea79ad82a6104571b5 | |
| parent | 086c03e83987dedc0ce31d84d748205c8240046d (diff) | |
mesa: inline _mesa_install_eval_vtxfmt
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14000>
| -rw-r--r-- | src/mesa/main/eval.c | 13 | ||||
| -rw-r--r-- | src/mesa/main/eval.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/vtxfmt.c | 7 |
3 files changed, 6 insertions, 18 deletions
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index 9db9934eaef..e67004f28da 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -823,19 +823,6 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, } -void -_mesa_install_eval_vtxfmt(struct _glapi_table *disp, - const GLvertexformat *vfmt) -{ - SET_EvalCoord1f(disp, vfmt->EvalCoord1f); - SET_EvalCoord1fv(disp, vfmt->EvalCoord1fv); - SET_EvalCoord2f(disp, vfmt->EvalCoord2f); - SET_EvalCoord2fv(disp, vfmt->EvalCoord2fv); - SET_EvalPoint1(disp, vfmt->EvalPoint1); - SET_EvalPoint2(disp, vfmt->EvalPoint2); -} - - /**********************************************************************/ /***** Initialization *****/ /**********************************************************************/ diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h index 938e3579b0e..3a12e7694ae 100644 --- a/src/mesa/main/eval.h +++ b/src/mesa/main/eval.h @@ -62,10 +62,6 @@ extern GLfloat *_mesa_copy_map_points2d(GLenum target, GLint vstride, GLint vorder, const GLdouble *points ); -extern void -_mesa_install_eval_vtxfmt(struct _glapi_table *disp, - const GLvertexformat *vfmt); - extern void _mesa_init_eval( struct gl_context *ctx ); extern void _mesa_free_eval_data( struct gl_context *ctx ); diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index 9d777d8cccf..89e4ff087fa 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -60,7 +60,12 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab, } if (ctx->API == API_OPENGL_COMPAT) { - _mesa_install_eval_vtxfmt(tab, vfmt); + SET_EvalCoord1f(tab, vfmt->EvalCoord1f); + SET_EvalCoord1fv(tab, vfmt->EvalCoord1fv); + SET_EvalCoord2f(tab, vfmt->EvalCoord2f); + SET_EvalCoord2fv(tab, vfmt->EvalCoord2fv); + SET_EvalPoint1(tab, vfmt->EvalPoint1); + SET_EvalPoint2(tab, vfmt->EvalPoint2); } if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { |