diff options
| author | Marek Olšák <[email protected]> | 2014-04-12 17:53:57 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-04-16 14:02:51 +0200 |
| commit | 586011486dba1c977d8f9aeb8f95b14e891afcbb (patch) | |
| tree | c2cadf9eebeb4563febbe5382e45b472dc038f73 /src/gallium/drivers/r600/r600_pipe.h | |
| parent | d4edc607670e37138f7a804ba208cf91acd9d0f1 (diff) | |
r600g: merge r600_flush with r600_context_flush
Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index d52de352063..a29bb3b3022 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -582,8 +582,8 @@ boolean r600_is_format_supported(struct pipe_screen *screen, void r600_update_db_shader_control(struct r600_context * rctx); /* r600_hw_context.c */ -void r600_context_flush(struct r600_context *ctx, unsigned flags, - struct pipe_fence_handle **fence); +void r600_context_gfx_flush(void *context, unsigned flags, + struct pipe_fence_handle **fence); void r600_begin_new_cs(struct r600_context *ctx); void r600_flush_emit(struct r600_context *ctx); void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw, boolean count_draw_in); |