summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/dlist.c3
-rw-r--r--src/mesa/main/dlist.h6
-rw-r--r--src/mesa/vbo/vbo_exec_api.c4
-rw-r--r--src/mesa/vbo/vbo_noop.c3
-rw-r--r--src/mesa/vbo/vbo_save_api.c3
5 files changed, 9 insertions, 10 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 0d12e306656..cfe612d9255 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -9558,7 +9558,8 @@ save_vtxfmt_init(GLvertexformat * vfmt)
vfmt->Begin = save_Begin;
- _MESA_INIT_DLIST_VTXFMT(vfmt, save_);
+ vfmt->CallList = save_CallList;
+ vfmt->CallLists = save_CallLists;
vfmt->Color3f = save_Color3f;
vfmt->Color3fv = save_Color3fv;
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index b67f5b535e7..4672d3e60f0 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -37,12 +37,6 @@
#include "main/mtypes.h"
-#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) \
- do { \
- (vfmt)->CallList = impl ## CallList; \
- (vfmt)->CallLists = impl ## CallLists; \
- } while (0)
-
GLboolean GLAPIENTRY
_mesa_IsList(GLuint list);
void GLAPIENTRY
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 53889d082b3..e6787c7e494 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -916,7 +916,9 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
vfmt->End = vbo_exec_End;
vfmt->PrimitiveRestartNV = vbo_exec_PrimitiveRestartNV;
- _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);
+ vfmt->CallList = _mesa_CallList;
+ vfmt->CallLists = _mesa_CallLists;
+
_MESA_INIT_EVAL_VTXFMT(vfmt, vbo_exec_);
vfmt->Rectf = vbo_exec_Rectf;
diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c
index 6e81947b03c..ec8be137685 100644
--- a/src/mesa/vbo/vbo_noop.c
+++ b/src/mesa/vbo/vbo_noop.c
@@ -426,7 +426,8 @@ _mesa_noop_vtxfmt_init(GLvertexformat * vfmt)
vfmt->Begin = _mesa_noop_Begin;
- _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);
+ vfmt->CallList = _mesa_CallList;
+ vfmt->CallLists = _mesa_CallLists;
vfmt->Color3f = _mesa_noop_Color3f;
vfmt->Color3fv = _mesa_noop_Color3fv;
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index a47ee7b45ef..94dc69dec33 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1518,7 +1518,8 @@ _save_vtxfmt_init(struct gl_context *ctx)
/* This will all require us to fallback to saving the list as opcodes:
*/
- _MESA_INIT_DLIST_VTXFMT(vfmt, _save_); /* inside begin/end */
+ vfmt->CallList = _save_CallList;
+ vfmt->CallLists = _save_CallLists;
_MESA_INIT_EVAL_VTXFMT(vfmt, _save_);