Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
diff --git a/src/gallium/drivers/i915/i915_batchbuffer.h b/src/gallium/drivers/i915/i915_batchbuffer.h
index 14ae749..0130ea1 100644
--- a/src/gallium/drivers/i915/i915_batchbuffer.h
+++ b/src/gallium/drivers/i915/i915_batchbuffer.h
@@ -48,7 +48,7 @@
static INLINE void
i915_winsys_batchbuffer_dword_unchecked(struct i915_winsys_batchbuffer *batch,
- unsigned dword)
+ unsigned dword)
{
*(unsigned *)batch->ptr = dword;
batch->ptr += 4;
@@ -74,8 +74,8 @@
static INLINE void
i915_winsys_batchbuffer_write(struct i915_winsys_batchbuffer *batch,
- void *data,
- size_t size)
+ void *data,
+ size_t size)
{
assert (i915_winsys_batchbuffer_space(batch) >= size);
@@ -85,8 +85,8 @@
static INLINE boolean
i915_winsys_validate_buffers(struct i915_winsys_batchbuffer *batch,
- struct i915_winsys_buffer **buffers,
- int num_of_buffers)
+ struct i915_winsys_buffer **buffers,
+ int num_of_buffers)
{
return batch->iws->validate_buffers(batch, buffers, num_of_buffers);
}
diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c b/src/gallium/drivers/i915/i915_fpc_translate.c
index a4ea912..c75f6c5 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -141,7 +141,7 @@
char buffer[1024];
debug_printf("i915_program_error: ");
- va_start( args, msg );
+ va_start( args, msg );
util_vsnprintf( buffer, sizeof(buffer), msg, args );
va_end( args );
debug_printf("%s", buffer);
diff --git a/src/gallium/drivers/i915/i915_prim_emit.c b/src/gallium/drivers/i915/i915_prim_emit.c
index 1acde97..85656cd 100644
--- a/src/gallium/drivers/i915/i915_prim_emit.c
+++ b/src/gallium/drivers/i915/i915_prim_emit.c
@@ -166,8 +166,6 @@
for (i = 0; i < nr; i++)
emit_hw_vertex(i915, prim->v[i]);
-
- i915_flush_heuristically(i915, nr);
}
diff --git a/src/gallium/drivers/i915/i915_prim_vbuf.c b/src/gallium/drivers/i915/i915_prim_vbuf.c
index d8ae1de..79db3b6 100644
--- a/src/gallium/drivers/i915/i915_prim_vbuf.c
+++ b/src/gallium/drivers/i915/i915_prim_vbuf.c
@@ -487,7 +487,6 @@
draw_arrays_generate_indices(render, start, nr, i915_render->fallback);
- i915_flush_heuristically(i915, nr_indices);
out:
return;
}
@@ -535,7 +534,6 @@
nr);
OUT_BATCH(start); /* Beginning vertex index */
- i915_flush_heuristically(i915, nr);
out:
return;
}
@@ -659,7 +657,6 @@
save_nr_indices,
i915_render->fallback);
- i915_flush_heuristically(i915, nr_indices);
out:
return;
}
diff --git a/src/gallium/drivers/i915/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c
index 4f44796..563c7d0 100644
--- a/src/gallium/drivers/i915/i915_state_emit.c
+++ b/src/gallium/drivers/i915/i915_state_emit.c
@@ -407,7 +407,7 @@
}
/* output the declarations of the program */
- for (i=1 ; i < i915->fs->program_len; i++)
+ for (i=1 ; i < i915->fs->program_len; i++)
OUT_BATCH(i915->fs->program[i]);
/* we emit an additional mov with swizzle to fake RGBA framebuffers */
diff --git a/src/gallium/drivers/i915/i915_winsys.h b/src/gallium/drivers/i915/i915_winsys.h
index 2043860..4c42c94 100644
--- a/src/gallium/drivers/i915/i915_winsys.h
+++ b/src/gallium/drivers/i915/i915_winsys.h
@@ -102,7 +102,7 @@
* @num_of_buffers size of the passed array
*/
boolean (*validate_buffers)(struct i915_winsys_batchbuffer *batch,
- struct i915_winsys_buffer **buffers,
+ struct i915_winsys_buffer **buffers,
int num_of_buffers);
/**