Some compile fixes.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index b55e52f4872548d751b0c8fc3d90d5ce03640afb..9e025a52318c2f3306eaa4e730c5df8e7993c0ce 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -55,6 +55,8 @@ 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 49e22f8074cb94ceac8fd6d8555f2c9f58c0b6b4..83ac2fd45568d0ba2940ab2ddfe87f806491a590 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -113,6 +113,8 @@ typedef struct nouveau_context {
 
        /* Configuration cache */
        driOptionCache optionCache;
+
+        uint32_t vblank_flags;
 }nouveauContextRec, *nouveauContextPtr;
 
 #define NOUVEAU_CONTEXT(ctx)           ((nouveauContextPtr)(ctx->DriverCtx))

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_tris.c b/src/mesa/drivers/dri/nouveau/nouveau_tris.c
index 607c811910cd69dfa475c0d1c991253e46dc6160..3a4839366271e6ca9abcee1c3733d3d221a747f1 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_tris.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_tris.c
@@ -25,6 +25,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 
 #include "nouveau_context.h"
+#include "nouveau_tris.h"
+#include <swrast.h>
 
 /* Common tri functions */
 

diff --git a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
index 0b061876cb3c72f5dbd93edb11c3f486814d58e3..3eafde39a7f2544b1444a4bb2ac8b2becf9653e4 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
@@ -56,6 +56,7 @@ static void nv10RenderPrimitive( GLcontext *ctx, GLenum prim );
 static void nv10RasterPrimitive( GLcontext *ctx, GLenum rprim, GLuint hwprim );
 
 
+
 /***********************************************************************
  *                    Emit primitives as inline vertices               *
  ***********************************************************************/