diff options
| author | Marek Olšák <[email protected]> | 2016-10-23 19:55:19 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-10-26 13:02:58 +0200 |
| commit | b5118fe0543400295be5b1a65a5001882498831e (patch) | |
| tree | f38b5bcb049bdf4cc90aea36f2dc6a9c29aa316d /src/gallium/drivers/r600 | |
| parent | 28d237d63d8161124e62b5dab6f864de494cd652 (diff) | |
gallium/radeon: stop using some input fields from radeon_surface
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 58d98a90550..6344c832b29 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1544,7 +1544,7 @@ static void evergreen_emit_framebuffer_state(struct r600_context *rctx, struct r &rctx->b.gfx, (struct r600_resource*)cb->base.texture, RADEON_USAGE_READWRITE, - tex->surface.nsamples > 1 ? + tex->resource.b.b.nr_samples > 1 ? RADEON_PRIO_COLOR_BUFFER_MSAA : RADEON_PRIO_COLOR_BUFFER); diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 2b58d982a91..4a94a1902ca 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -756,7 +756,7 @@ r600_create_sampler_view_custom(struct pipe_context *ctx, S_038004_TEX_DEPTH(depth - 1) | S_038004_DATA_FORMAT(format)); view->tex_resource_words[2] = tmp->surface.level[offset_level].offset >> 8; - if (offset_level >= tmp->surface.last_level) { + if (offset_level >= tmp->resource.b.b.last_level) { view->tex_resource_words[3] = tmp->surface.level[offset_level].offset >> 8; } else { view->tex_resource_words[3] = tmp->surface.level[offset_level + 1].offset >> 8; |