summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>2006-09-17 14:36:07 +0000
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>2006-09-17 14:36:07 +0000
commitc67f54552077b780df574cbcdea70b2cc37076ef (patch)
tree34a32d85ff7672d41f80e73a71a361cc0d1f53fc
parente324c52237fd1184a1f8436c8735cdd9ade5e067 (diff)
Small changes
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_context.c2
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_context.h2
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_tris.c1
-rw-r--r--src/mesa/drivers/dri/nouveau/nv10_swtcl.c5
4 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 683e6d6ea6..d84e73c015 100644
--- 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 28fe944280..c5783993c7 100644
--- 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 8622b9349c..bb8ead3b23 100644
--- 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 65c24f3779..af9f4fabf4 100644
--- 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");
}