X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Feval.h;h=1b6c704ca3b1a1c650f7b54fdea35ac94a88ce41;hb=c73245882c7ff1277b190b97f093f7b423a22f10;hp=ffd1bab76da38ffc4a2e28cd3484b5eb4a541610;hpb=11522b74b318db9d099466ff226124c23595e8e2;p=mesa.git diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h index ffd1bab76da..1b6c704ca3b 100644 --- a/src/mesa/main/eval.h +++ b/src/mesa/main/eval.h @@ -37,11 +37,10 @@ #define EVAL_H +#include "main/mfeatures.h" #include "main/mtypes.h" -#if FEATURE_evaluators - #define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) \ do { \ (vfmt)->EvalCoord1f = impl ## EvalCoord1f; \ @@ -57,10 +56,6 @@ extern GLuint _mesa_evaluator_components( GLenum target ); -extern void gl_free_control_points( GLcontext *ctx, - GLenum target, GLfloat *data ); - - extern GLfloat *_mesa_copy_map_points1f( GLenum target, GLint ustride, GLint uorder, const GLfloat *points ); @@ -83,28 +78,47 @@ extern void _mesa_install_eval_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -extern void -_mesa_init_eval_dispatch(struct _glapi_table *disp); - -#else /* FEATURE_evaluators */ - -#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) do { } while (0) - -static INLINE void -_mesa_install_eval_vtxfmt(struct _glapi_table *disp, - const GLvertexformat *vfmt) -{ -} - -static INLINE void -_mesa_init_eval_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_evaluators */ - -extern void _mesa_init_eval( GLcontext *ctx ); -extern void _mesa_free_eval_data( GLcontext *ctx ); - +extern void _mesa_init_eval( struct gl_context *ctx ); +extern void _mesa_free_eval_data( struct gl_context *ctx ); + +void GLAPIENTRY +_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, + GLint order, const GLfloat *points ); +void GLAPIENTRY +_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, + GLint order, const GLdouble *points ); +void GLAPIENTRY +_mesa_Map2f( GLenum target, + GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, + GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, + const GLfloat *points); +void GLAPIENTRY +_mesa_Map2d( GLenum target, + GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, + GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, + const GLdouble *points ); +void GLAPIENTRY +_mesa_GetnMapdvARB( GLenum target, GLenum query, GLsizei bufSize, + GLdouble *v ); +void GLAPIENTRY +_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v ); +void GLAPIENTRY +_mesa_GetnMapfvARB( GLenum target, GLenum query, GLsizei bufSize, GLfloat *v ); +void GLAPIENTRY +_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v ); +void GLAPIENTRY +_mesa_GetnMapivARB( GLenum target, GLenum query, GLsizei bufSize, GLint *v ); +void GLAPIENTRY +_mesa_GetMapiv( GLenum target, GLenum query, GLint *v ); +void GLAPIENTRY +_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 ); +void GLAPIENTRY +_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 ); +void GLAPIENTRY +_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, + GLint vn, GLfloat v1, GLfloat v2 ); +void GLAPIENTRY +_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, + GLint vn, GLdouble v1, GLdouble v2 ); #endif /* EVAL_H */