Small changes

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 683e6d6..d84e73c 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -55,8 +55,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 int NOUVEAU_DEBUG = 0;
 #endif
 
-#define NOUVEAU_FALLBACK_DISABLE 1
-
 static const struct dri_debug_control debug_control[] =
 {
        { NULL,    0 }

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h
index 28fe944..c578399 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -92,7 +92,7 @@ typedef struct nouveau_context {
 
        /* Vertex state */
        GLuint vertex_size;
-       char *verts;
+       GLubyte *verts;
        struct tnl_attr_map vertex_attrs[VERT_ATTRIB_MAX];
        GLuint vertex_attr_count;
 

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_tris.c b/src/mesa/drivers/dri/nouveau/nouveau_tris.c
index 8622b93..bb8ead3 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_tris.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_tris.c
@@ -74,7 +74,6 @@ void nouveau_fallback_point(struct nouveau_context *nmesa,
 void nouveauFallback(struct nouveau_context *nmesa, GLuint bit, GLboolean mode)
 {
        GLcontext *ctx = nmesa->glCtx;
-       TNLcontext *tnl = TNL_CONTEXT(ctx);
        GLuint oldfallback = nmesa->Fallback;
 
        if (mode) {

diff --git a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
index 65c24f3..af9f4fa 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
@@ -48,6 +48,7 @@
 #include "nouveau_reg.h"
 #include "nouveau_tex.h"
 #include "nouveau_fifo.h"
+#include "nouveau_msg.h"
 
 /* XXX hack for now */
 #define channel 1
@@ -651,8 +652,7 @@ static inline void nv10OutputVertexFormat(struct nouveau_context* nmesa, GLuint
        for(i=8;i<16;i++)
        {
                if (index&(1<<i))
-                       /* FIXME that is very dubious */
-                       attr_size[i]=VB->TexCoordPtr[i];
+                       attr_size[i]=VB->TexCoordPtr[i]->size;
                else
                        attr_size[i]=0;
        }
@@ -822,6 +822,7 @@ static void nv10RenderPrimitive( GLcontext *ctx, GLuint prim )
 static void nv10ResetLineStipple( GLcontext *ctx )
 {
        /* FIXME do something here */
+       WARN_ONCE("Unimplemented nv10ResetLineStipple\n");
 }