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.
This commit is contained in:
Marek Olšák 2012-03-05 15:20:44 +01:00
parent 45d731fdf9
commit 6ed5855009
5 changed files with 7 additions and 11 deletions

View File

@ -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

View File

@ -48,7 +48,6 @@
#include "r600_resource.h"
#include "r600_shader.h"
#include "r600_pipe.h"
#include "r600_hw_context_priv.h"
/*
* pipe_context

View File

@ -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;

View File

@ -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)
{

View File

@ -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)
{