diff options
author | Marek Olšák <[email protected]> | 2013-09-21 19:56:24 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2013-09-29 15:18:08 +0200 |
commit | 39801d4ba7e19e9ce1dbde3ba3441cae38e7dbaa (patch) | |
tree | 43f6a5260a9ba663341904e4f9902915cf60855a /src/gallium/drivers/r600/r600_state.c | |
parent | a62cd6949cee46096e016ef8249a4a6975d63c4a (diff) |
r600g,radeonsi: consolidate transfer, cmask, and fmask structures
Diffstat (limited to 'src/gallium/drivers/r600/r600_state.c')
-rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 7a7ed7290ff..5411f743a63 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -1399,14 +1399,14 @@ static void r600_init_color_surface(struct r600_context *rctx, pipe_resource_reference((struct pipe_resource**)&surf->cb_buffer_fmask, &rtex->resource.b.b); - if (rtex->cmask_size) { - surf->cb_color_cmask = rtex->cmask_offset >> 8; - surf->cb_color_mask |= S_028100_CMASK_BLOCK_MAX(rtex->cmask_slice_tile_max); + if (rtex->cmask.size) { + surf->cb_color_cmask = rtex->cmask.offset >> 8; + surf->cb_color_mask |= S_028100_CMASK_BLOCK_MAX(rtex->cmask.slice_tile_max); - if (rtex->fmask_size) { + if (rtex->fmask.size) { color_info |= S_0280A0_TILE_MODE(V_0280A0_FRAG_ENABLE); - surf->cb_color_fmask = rtex->fmask_offset >> 8; - surf->cb_color_mask |= S_028100_FMASK_TILE_MAX(rtex->fmask_slice_tile_max); + surf->cb_color_fmask = rtex->fmask.offset >> 8; + surf->cb_color_mask |= S_028100_FMASK_TILE_MAX(rtex->fmask.slice_tile_max); } else { /* cmask only */ color_info |= S_0280A0_TILE_MODE(V_0280A0_CLEAR_ENABLE); } @@ -1611,7 +1611,7 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx, rctx->framebuffer.export_16bpc = false; } - if (rtex->fmask_size && rtex->cmask_size) { + if (rtex->fmask.size && rtex->cmask.size) { rctx->framebuffer.compressed_cb_mask |= 1 << i; } } |