diff options
| author | Michel Dänzer <[email protected]> | 2012-05-10 13:54:27 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2012-05-10 13:54:27 +0200 |
| commit | 8f45cea81fb93f632bbe804463f51c0ad909dd41 (patch) | |
| tree | 4b54cc0e8fd3ed6021cb31ac6a31bae38f2717b1 /src | |
| parent | 36d2914a19e48a702ed2303e272a92e487f00f3e (diff) | |
radeonsi: Eliminate one more magic number for texture image resources.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeonsi/evergreen_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/evergreen_state.c b/src/gallium/drivers/radeonsi/evergreen_state.c index c70b0b24d79..3ab8d9d255c 100644 --- a/src/gallium/drivers/radeonsi/evergreen_state.c +++ b/src/gallium/drivers/radeonsi/evergreen_state.c @@ -1259,9 +1259,9 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte va = r600_resource_va(ctx->screen, texture); view->state[0] = (va + tmp->offset[0]) >> 8; - view->state[1] = ((va + tmp->offset[0]) >> 40) & 0xff; - view->state[1] |= (S_008F14_DATA_FORMAT(format) | - S_008F14_NUM_FORMAT(num_format)); + view->state[1] = (S_008F14_BASE_ADDRESS_HI((va + tmp->offset[0]) >> 40) | + S_008F14_DATA_FORMAT(format) | + S_008F14_NUM_FORMAT(num_format)); view->state[2] = (S_008F18_WIDTH(texture->width0 - 1) | S_008F18_HEIGHT(height - 1)); view->state[3] = (S_008F1C_DST_SEL_X(si_map_swizzle(swizzle[0])) | |