summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeon/r600_streamout.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2014-08-06 22:29:27 +0200
committerMarek Olšák <[email protected]>2014-08-09 23:41:16 +0200
commit8c235465cd742c65c8f5550f8bda89b7cd4e3b33 (patch)
tree3e18a84258af450ec8782a72a87c51f7fd60ad5d /src/gallium/drivers/radeon/r600_streamout.c
parentf6c392a2705322a01ff75d5bdc2c8f7df42b484b (diff)
gallium/radeon: use gpu_address from r600_resource
Reviewed-by: Christian König <[email protected]> Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_streamout.c')
-rw-r--r--src/gallium/drivers/radeon/r600_streamout.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeon/r600_streamout.c b/src/gallium/drivers/radeon/r600_streamout.c
index cb72ada4aff..e2413c250ea 100644
--- a/src/gallium/drivers/radeon/r600_streamout.c
+++ b/src/gallium/drivers/radeon/r600_streamout.c
@@ -212,8 +212,7 @@ static void r600_emit_streamout_begin(struct r600_common_context *rctx, struct r
t[i]->b.buffer_size) >> 2); /* BUFFER_SIZE (in DW) */
radeon_emit(cs, stride_in_dw[i]); /* VTX_STRIDE (in DW) */
} else {
- uint64_t va = r600_resource_va(rctx->b.screen,
- (void*)t[i]->b.buffer);
+ uint64_t va = r600_resource(t[i]->b.buffer)->gpu_address;
update_flags |= SURFACE_BASE_UPDATE_STRMOUT(i);
@@ -239,8 +238,7 @@ static void r600_emit_streamout_begin(struct r600_common_context *rctx, struct r
}
if (rctx->streamout.append_bitmask & (1 << i)) {
- uint64_t va = r600_resource_va(rctx->b.screen,
- (void*)t[i]->buf_filled_size) +
+ uint64_t va = t[i]->buf_filled_size->gpu_address +
t[i]->buf_filled_size_offset;
/* Append. */
@@ -286,8 +284,7 @@ void r600_emit_streamout_end(struct r600_common_context *rctx)
if (!t[i])
continue;
- va = r600_resource_va(rctx->b.screen,
- (void*)t[i]->buf_filled_size) + t[i]->buf_filled_size_offset;
+ va = t[i]->buf_filled_size->gpu_address + t[i]->buf_filled_size_offset;
radeon_emit(cs, PKT3(PKT3_STRMOUT_BUFFER_UPDATE, 4, 0));
radeon_emit(cs, STRMOUT_SELECT_BUFFER(i) |
STRMOUT_OFFSET_SOURCE(STRMOUT_OFFSET_NONE) |