Module: Mesa Branch: master Commit: 6ed5855009a0ab8c6f88cad1ae517e49d8953d98 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ed5855009a0ab8c6f88cad1ae517e49d8953d98
Author: Marek Olšák <[email protected]> Date: Mon Mar 5 15:20:44 2012 +0100 r600g: move r600_context_bo_reloc to r600_pipe.h so that we don't have to include r600_hw_context_priv.h outside of the *hw_context* files. --- src/gallium/drivers/r600/r600_hw_context_priv.h | 8 -------- src/gallium/drivers/r600/r600_pipe.c | 1 - src/gallium/drivers/r600/r600_pipe.h | 7 +++++++ src/gallium/drivers/r600/r600_query.c | 1 - src/gallium/drivers/r600/r600_state_common.c | 1 - 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h index 67aca97..47a14ff 100644 --- a/src/gallium/drivers/r600/r600_hw_context_priv.h +++ b/src/gallium/drivers/r600/r600_hw_context_priv.h @@ -69,12 +69,4 @@ void r600_context_ps_partial_flush(struct r600_context *ctx); void evergreen_flush_vgt_streamout(struct r600_context *ctx); void evergreen_set_streamout_enable(struct r600_context *ctx, unsigned buffer_enable_bit); - -static INLINE unsigned r600_context_bo_reloc(struct r600_context *ctx, struct r600_resource *rbo, - enum radeon_bo_usage usage) -{ - assert(usage); - return ctx->ws->cs_add_reloc(ctx->cs, rbo->cs_buf, usage, rbo->domains) * 4; -} - #endif diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index db1bf0e..df1ca6b 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -48,7 +48,6 @@ #include "r600_resource.h" #include "r600_shader.h" #include "r600_pipe.h" -#include "r600_hw_context_priv.h" /* * pipe_context diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 08441d1..d92de42 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -634,6 +634,13 @@ void r600_release_command_buffer(struct r600_command_buffer *cb); * Helpers for emitting state into a command stream directly. */ +static INLINE unsigned r600_context_bo_reloc(struct r600_context *ctx, struct r600_resource *rbo, + enum radeon_bo_usage usage) +{ + assert(usage); + return ctx->ws->cs_add_reloc(ctx->cs, rbo->cs_buf, usage, rbo->domains) * 4; +} + static INLINE void r600_write_value(struct radeon_winsys_cs *cs, unsigned value) { cs->buf[cs->cdw++] = value; diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c index df5764a..c29d349 100644 --- a/src/gallium/drivers/r600/r600_query.c +++ b/src/gallium/drivers/r600/r600_query.c @@ -23,7 +23,6 @@ #include "r600_pipe.h" #include "r600d.h" #include "util/u_memory.h" -#include "r600_hw_context_priv.h" static bool r600_is_timer_query(unsigned type) { diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 87dec34..77bfcea 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -33,7 +33,6 @@ #include "r600_formats.h" #include "r600_pipe.h" #include "r600d.h" -#include "r600_hw_context_priv.h" static void r600_emit_command_buffer(struct r600_context *rctx, struct r600_atom *atom) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
