Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict

Conflicts:
	src/mesa/drivers/dri/r300/r300_cmdbuf.c
	src/mesa/drivers/dri/radeon/radeon_cmdbuf.h

3 files changed, 6 insertions, 6 deletions

diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index b08af116a1..87651716fe 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -105,7 +105,7 @@ void emit_vpu(GLcontext *ctx, struct radeon_state_atom * atom)
 	ndw -= 5;
 	OUT_BATCH_REGVAL(R300_VAP_PVS_VECTOR_INDX_REG, addr);
 	OUT_BATCH(CP_PACKET0(R300_VAP_PVS_UPLOAD_DATA, ndw-1) | RADEON_ONE_REG_WR);
-	OUT_BATCH_TABLE(atom->cmd + 1, ndw);
+	OUT_BATCH_TABLE(&atom->cmd[1], ndw);
 	OUT_BATCH_REGVAL(R300_VAP_PVS_STATE_FLUSH_REG, 0);
 	END_BATCH();
 }
@@ -134,7 +134,7 @@ void emit_r500fp(GLcontext *ctx, struct radeon_state_atom * atom)
 	OUT_BATCH(addr);
 	ndw-=3;
 	OUT_BATCH(CP_PACKET0(R500_GA_US_VECTOR_DATA, ndw-1) | RADEON_ONE_REG_WR);
-	OUT_BATCH_TABLE(atom->cmd + 1, ndw);
+	OUT_BATCH_TABLE(&atom->cmd[1], ndw);
 	END_BATCH();
 }
 
diff --git a/src/mesa/drivers/dri/r300/r300_draw.c b/src/mesa/drivers/dri/r300/r300_draw.c
index 6652b396b9..2ac898bd59 100644
--- a/src/mesa/drivers/dri/r300/r300_draw.c
+++ b/src/mesa/drivers/dri/r300/r300_draw.c
@@ -109,11 +109,11 @@ static void r300FixupIndexBuffer(GLcontext *ctx, const struct _mesa_index_buffer
 
 #if MESA_BIG_ENDIAN
 	} else { /* if (mesa_ind_buf->type == GL_UNSIGNED_SHORT) */
-		GLuint size;
 		GLushort *in = (GLushort *)src_ptr;
-		size = sizeof(GLushort) * ((mesa_ind_buf->count + 1) & ~1);
+		GLuint size = sizeof(GLushort) * ((mesa_ind_buf->count + 1) & ~1);
 
-		radeonAllocDmaRegion(&r300->radeon, &r300->ind_buf.bo, &r300->ind_buf.bo_offet, size, 4);
+		radeonAllocDmaRegion(&r300->radeon, &r300->ind_buf.bo,
+				     &r300->ind_buf.bo_offset, size, 4);
 
 		assert(r300->ind_buf.bo->ptr != NULL);
 		out = (GLuint *)ADD_POINTERS(r300->ind_buf.bo->ptr, r300->ind_buf.bo_offset);
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index f3674f9c7b..446cf40131 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -390,7 +390,7 @@ void r300RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim)
 		GLuint first, incr, offset = 0;
 
 		if (!split_prim_inplace(prim & PRIM_MODE_MASK, &first, &incr) &&
-			num_verts > 65500) {
+			num_verts > 65535) {
 			WARN_ONCE("Fixme: can't handle spliting prim %d\n", prim);
 			return;
 		}