summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2004-02-24 02:42:46 +0000
committerBrian Paul <[email protected]>2004-02-24 02:42:46 +0000
commitffa7eff9ff459060364f0ed93865351f7fc15035 (patch)
treeee9b8f3db41ea0b53b401795ef7ff054fd75b151 /src/mesa
parentcf20f8cc3f92fcc6441b55a793bcede0d83a2a69 (diff)
glDrawArrays loop was wrong
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/api_noop.c9
-rw-r--r--src/mesa/main/api_validate.c3
-rw-r--r--src/mesa/tnl/t_save_api.c4
3 files changed, 7 insertions, 9 deletions
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index bde37e70e3d..6b331faa2d5 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -1,9 +1,8 @@
-
/*
* Mesa 3-D graphics library
- * Version: 5.1
+ * Version: 6.1
*
- * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -616,8 +615,8 @@ void GLAPIENTRY _mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count)
return;
glBegin(mode);
- for (i = start ; i < count ; i++)
- glArrayElement( i );
+ for (i = 0; i < count; i++)
+ glArrayElement(start + i);
glEnd();
}
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 004a7595a02..4e09c2855a5 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -227,8 +227,7 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
_mesa_update_state(ctx);
/* Always need vertex positions */
- if (!ctx->Array.Vertex.Enabled
- && !(ctx->VertexProgram.Enabled && ctx->Array.VertexAttrib[0].Enabled))
+ if (!ctx->Array.Vertex.Enabled && !ctx->Array.VertexAttrib[0].Enabled)
return GL_FALSE;
if (ctx->Const.CheckArrayBounds) {
diff --git a/src/mesa/tnl/t_save_api.c b/src/mesa/tnl/t_save_api.c
index b6d083d7a11..db338bbef6c 100644
--- a/src/mesa/tnl/t_save_api.c
+++ b/src/mesa/tnl/t_save_api.c
@@ -1297,8 +1297,8 @@ static void GLAPIENTRY _save_OBE_DrawArrays(GLenum mode, GLint start, GLsizei co
return;
_save_NotifyBegin( ctx, mode | PRIM_WEAK );
- for (i = start ; i < count ; i++)
- _glapi_Dispatch->ArrayElement( i );
+ for (i = 0; i < count; i++)
+ _glapi_Dispatch->ArrayElement(start + i);
_glapi_Dispatch->End();
}