Mesa (master): r600g: deinline r600_pipe_state_add_reg.

Dave Airlie airlied at kemper.freedesktop.org
Thu Jun 2 05:17:50 UTC 2011


Module: Mesa
Branch: master
Commit: 42502b6f03230b828121f60143190c39bc5c8dda
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=42502b6f03230b828121f60143190c39bc5c8dda

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Jun  2 14:53:15 2011 +1000

r600g: deinline r600_pipe_state_add_reg.

This is going to get too big to be a forced inline. Also going to remove it
from some hotpaths.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/r600/r600.h              |   16 ++++------------
 src/gallium/drivers/r600/r600_state_common.c |   13 +++++++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index aa6a213..2495aab 100644
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -310,18 +310,10 @@ void evergreen_context_pipe_state_set_vs_sampler(struct r600_context *ctx, struc
 
 struct radeon *radeon_decref(struct radeon *radeon);
 
-static inline void _r600_pipe_state_add_reg(struct r600_context *ctx,
-					    struct r600_pipe_state *state,
-					    u32 offset, u32 value, u32 mask,
-					    struct r600_bo *bo)
-{
-	state->regs[state->nregs].offset = offset;
-	state->regs[state->nregs].value = value;
-	state->regs[state->nregs].mask = mask;
-	state->regs[state->nregs].bo = bo;
-	state->nregs++;
-	assert(state->nregs < R600_BLOCK_MAX_REG);
-}
+void _r600_pipe_state_add_reg(struct r600_context *ctx,
+			      struct r600_pipe_state *state,
+			      u32 offset, u32 value, u32 mask,
+			      struct r600_bo *bo);
 
 #define r600_pipe_state_add_reg(state, offset, value, mask, bo) _r600_pipe_state_add_reg(&rctx->ctx, state, offset, value, mask, bo)
 
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 4619d29..e1d637a 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -630,3 +630,16 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 
 	u_vbuf_mgr_draw_end(rctx->vbuf_mgr);
 }
+
+void _r600_pipe_state_add_reg(struct r600_context *ctx,
+			      struct r600_pipe_state *state,
+			      u32 offset, u32 value, u32 mask,
+			      struct r600_bo *bo)
+{
+	state->regs[state->nregs].offset = offset;
+	state->regs[state->nregs].value = value;
+	state->regs[state->nregs].mask = mask;
+	state->regs[state->nregs].bo = bo;
+	state->nregs++;
+	assert(state->nregs < R600_BLOCK_MAX_REG);
+}




More information about the mesa-commit mailing list