fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 20:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: remove _MESA_INIT_EVAL_VTXFMT() macro

Browse source 
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul 2013-05-01 19:15:33 -06:00
parent 43b3d3bc25
commit d0102500bd
5 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/main/dlist.c
View file

@ -9568,7 +9568,14 @@ save_vtxfmt_init(GLvertexformat * vfmt)
vfmt->EdgeFlag = save_EdgeFlag;
vfmt->End = save_End;
_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;
vfmt->FogCoordfEXT = save_FogCoordfEXT;
vfmt->FogCoordfvEXT = save_FogCoordfvEXT;

12
src/mesa/main/eval.h
View file

@ -42,18 +42,6 @@
#include <stdbool.h>
#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) \
do { \
(vfmt)->EvalCoord1f = impl ## EvalCoord1f; \
(vfmt)->EvalCoord1fv = impl ## EvalCoord1fv; \
(vfmt)->EvalCoord2f = impl ## EvalCoord2f; \
(vfmt)->EvalCoord2fv = impl ## EvalCoord2fv; \
(vfmt)->EvalPoint1 = impl ## EvalPoint1; \
(vfmt)->EvalPoint2 = impl ## EvalPoint2; \
(vfmt)->EvalMesh1 = impl ## EvalMesh1; \
(vfmt)->EvalMesh2 = impl ## EvalMesh2; \
} while (0)
extern GLuint _mesa_evaluator_components( GLenum target );

9
src/mesa/vbo/vbo_exec_api.c
View file

@ -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;

9
src/mesa/vbo/vbo_noop.c
View file

@ -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;

9
src/mesa/vbo/vbo_save_api.c
View file

@ -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.