diff options
| -rw-r--r-- | src/gallium/drivers/i915/i915_batchbuffer.h | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_fpc_translate.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_prim_emit.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_prim_vbuf.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_state_emit.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_winsys.h | 2 |
6 files changed, 8 insertions, 13 deletions
diff --git a/src/gallium/drivers/i915/i915_batchbuffer.h b/src/gallium/drivers/i915/i915_batchbuffer.h index 14ae749c828..0130ea17301 100644 --- a/src/gallium/drivers/i915/i915_batchbuffer.h +++ b/src/gallium/drivers/i915/i915_batchbuffer.h @@ -48,7 +48,7 @@ i915_winsys_batchbuffer_check(struct i915_winsys_batchbuffer *batch, 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 @@ i915_winsys_batchbuffer_dword(struct i915_winsys_batchbuffer *batch, 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 @@ i915_winsys_batchbuffer_write(struct i915_winsys_batchbuffer *batch, 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 a4ea9127976..c75f6c5fd63 100644 --- a/src/gallium/drivers/i915/i915_fpc_translate.c +++ b/src/gallium/drivers/i915/i915_fpc_translate.c @@ -141,7 +141,7 @@ i915_program_error(struct i915_fp_compile *p, const char *msg, ...) 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 1acde97d4bd..85656cd7846 100644 --- a/src/gallium/drivers/i915/i915_prim_emit.c +++ b/src/gallium/drivers/i915/i915_prim_emit.c @@ -166,8 +166,6 @@ emit_prim( struct draw_stage *stage, 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 d8ae1de2963..79db3b650eb 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_fallback(struct vbuf_render *render, draw_arrays_generate_indices(render, start, nr, i915_render->fallback); - i915_flush_heuristically(i915, nr_indices); out: return; } @@ -535,7 +534,6 @@ i915_vbuf_render_draw_arrays(struct vbuf_render *render, nr); OUT_BATCH(start); /* Beginning vertex index */ - i915_flush_heuristically(i915, nr); out: return; } @@ -659,7 +657,6 @@ i915_vbuf_render_draw_elements(struct vbuf_render *render, 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 4f447962bb9..563c7d07be2 100644 --- a/src/gallium/drivers/i915/i915_state_emit.c +++ b/src/gallium/drivers/i915/i915_state_emit.c @@ -407,7 +407,7 @@ emit_program(struct i915_context *i915) } /* 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 20438609e07..4c42c94fc00 100644 --- a/src/gallium/drivers/i915/i915_winsys.h +++ b/src/gallium/drivers/i915/i915_winsys.h @@ -102,7 +102,7 @@ struct i915_winsys { * @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); /** |