diff options
| author | Marek Olšák <[email protected]> | 2017-04-02 14:30:16 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-05-10 19:00:16 +0200 |
| commit | c24c3b94ed29ecd99b1101c74c6c4606f9b5580e (patch) | |
| tree | 81f6966bc59a68d9867693c65d35fae9bb1d9819 /src/gallium/drivers/etnaviv | |
| parent | fe437882ea2d60e91c244cc95beb4b79c615af49 (diff) | |
gallium: decrease the size of pipe_vertex_buffer - 24 -> 16 bytes
Diffstat (limited to 'src/gallium/drivers/etnaviv')
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_context.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_state.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c index e426d4f1d19..2e5e7f6446a 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.c +++ b/src/gallium/drivers/etnaviv/etnaviv_context.c @@ -234,8 +234,8 @@ etna_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) /* Mark VBOs as being read */ for (i = 0; i < ctx->vertex_buffer.count; i++) { - assert(!ctx->vertex_buffer.vb[i].user_buffer); - resource_read(ctx, ctx->vertex_buffer.vb[i].buffer); + assert(!ctx->vertex_buffer.vb[i].is_user_buffer); + resource_read(ctx, ctx->vertex_buffer.vb[i].buffer.resource); } /* Mark index buffer as being read */ diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c index d96b445632d..dcc587daccb 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_state.c @@ -428,11 +428,11 @@ etna_set_vertex_buffers(struct pipe_context *pctx, unsigned start_slot, struct compiled_set_vertex_buffer *cs = &so->cvb[idx]; struct pipe_vertex_buffer *vbi = &so->vb[idx]; - assert(!vbi->user_buffer); /* XXX support user_buffer using - etna_usermem_map */ + assert(!vbi->is_user_buffer); /* XXX support user_buffer using + etna_usermem_map */ - if (vbi->buffer) { /* GPU buffer */ - cs->FE_VERTEX_STREAM_BASE_ADDR.bo = etna_resource(vbi->buffer)->bo; + if (vbi->buffer.resource) { /* GPU buffer */ + cs->FE_VERTEX_STREAM_BASE_ADDR.bo = etna_resource(vbi->buffer.resource)->bo; cs->FE_VERTEX_STREAM_BASE_ADDR.offset = vbi->buffer_offset; cs->FE_VERTEX_STREAM_BASE_ADDR.flags = ETNA_RELOC_READ; cs->FE_VERTEX_STREAM_CONTROL = |