more macros, still missing the alloc_verts one

diff --git a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
index 2ed151f0fc1266f787151a05f0b7054119089496..35135fc706e036af0be0a8c7e2207cca7327a537 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
@@ -167,6 +167,11 @@ static inline void nv10_draw_point(nouveauContextPtr nmesa,
 
 
 #define CTX_ARG nouveauContextPtr nmesa
+#define GET_VERTEX_DWORDS() nmesa->vertex_size
+#define LOCAL_VARS                                             \
+   nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);             \
+   const char *nouveauverts = (char *)nmesa->verts;
+#define VERT(x) (r200Vertex *)(r200verts + ((x) * vertsize * sizeof(int)))
 #define VERTEX nouveauVertex
 
 #undef TAG
@@ -269,6 +274,7 @@ static struct {
 #define VERT_RESTORE_SPEC( idx ) if (specoffset) v[idx]->f[specoffset] = spec[idx]
 
 
+#undef LOCAL_VARS
 #define LOCAL_VARS(n)                                                          \
        struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);                  \
 GLuint color[n], spec[n];                                                      \