diff options
| author | Rob Clark <[email protected]> | 2014-10-14 12:20:54 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2014-10-15 15:49:48 -0400 |
| commit | d5d80b37392c7f15c4fb39b6b1826230239930fd (patch) | |
| tree | a70ad7ceaea741ea2040996759c7d982fb875011 /src/gallium/drivers/freedreno/a2xx | |
| parent | 57de9bbb632ed7639d07d37965dcee5a1fe3bf30 (diff) | |
freedreno/a3xx: refactor vertex state emit
Get rid of fd3_vertex_buf and use fd_vertex_state directly for all
draws. Removes a tiny bit of CPU overhead for munging around the vertex
state every time it is emitted, but more importantly it cleans things up
for later optimizations, so the emit paths don't have to special case
internal draws (gmem<->mem, clears, etc) with regular draws.
Instead of constructing fd3_vertex_buf array each time for internal
draws, and context init time pre-create solid_vbuf_state and
blit_vbuf_state.
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium/drivers/freedreno/a2xx')
| -rw-r--r-- | src/gallium/drivers/freedreno/a2xx/fd2_draw.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/a2xx/fd2_program.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_draw.c b/src/gallium/drivers/freedreno/a2xx/fd2_draw.c index bc7960a28a5..6c1a5904332 100644 --- a/src/gallium/drivers/freedreno/a2xx/fd2_draw.c +++ b/src/gallium/drivers/freedreno/a2xx/fd2_draw.c @@ -56,8 +56,8 @@ emit_cacheflush(struct fd_ringbuffer *ring) static void emit_vertexbufs(struct fd_context *ctx) { - struct fd_vertex_stateobj *vtx = ctx->vtx; - struct fd_vertexbuf_stateobj *vertexbuf = &ctx->vertexbuf; + struct fd_vertex_stateobj *vtx = ctx->vtx.vtx; + struct fd_vertexbuf_stateobj *vertexbuf = &ctx->vtx.vertexbuf; struct fd2_vertex_buf bufs[PIPE_MAX_ATTRIBS]; unsigned i; diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_program.c b/src/gallium/drivers/freedreno/a2xx/fd2_program.c index 84b6ffec338..cb6281bd5db 100644 --- a/src/gallium/drivers/freedreno/a2xx/fd2_program.c +++ b/src/gallium/drivers/freedreno/a2xx/fd2_program.c @@ -174,7 +174,7 @@ patch_vtx_fetches(struct fd_context *ctx, struct fd2_shader_stateobj *so, struct ir2_instruction *instr = so->vfetch_instrs[i]; struct pipe_vertex_element *elem = &vtx->pipe[i]; struct pipe_vertex_buffer *vb = - &ctx->vertexbuf.vb[elem->vertex_buffer_index]; + &ctx->vtx.vertexbuf.vb[elem->vertex_buffer_index]; enum pipe_format format = elem->src_format; const struct util_format_description *desc = util_format_description(format); @@ -258,7 +258,7 @@ fd2_program_validate(struct fd_context *ctx) /* if necessary, fix up vertex fetch instructions: */ if (ctx->dirty & (FD_DIRTY_VTXSTATE | FD_DIRTY_PROG)) - patch_vtx_fetches(ctx, prog->vp, ctx->vtx); + patch_vtx_fetches(ctx, prog->vp, ctx->vtx.vtx); /* if necessary, fix up texture fetch instructions: */ if (ctx->dirty & (FD_DIRTY_TEXSTATE | FD_DIRTY_PROG)) { |