diff options
| author | Marek Olšák <[email protected]> | 2016-08-30 23:42:29 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-03-30 14:44:33 +0200 |
| commit | e6c520362d56dc51efc6700dc18828bd150bc5b5 (patch) | |
| tree | 7eb430491c4ab8fe61f1480377f992428943e0bd /src/gallium/drivers/radeonsi | |
| parent | 7e7043c31ca555638e5854a93d3323db0e25758c (diff) | |
amd: resolve remaining definition conflicts with gfx9d.h
Add _GFX6 and _GFX9 suffixes to conflicting definitions.
sid.h and gfx9d.h can now be included in the same file.
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 2e62725e9ca..c13bc942dc7 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -394,14 +394,14 @@ void si_set_mutable_tex_desc_fields(struct r600_texture *tex, state[1] &= C_008F14_BASE_ADDRESS_HI; state[3] &= C_008F1C_TILING_INDEX; - state[4] &= C_008F20_PITCH; + state[4] &= C_008F20_PITCH_GFX6; state[6] &= C_008F28_COMPRESSION_EN; state[0] = va >> 8; state[1] |= S_008F14_BASE_ADDRESS_HI(va >> 40); state[3] |= S_008F1C_TILING_INDEX(si_tile_mode_index(tex, base_level, is_stencil)); - state[4] |= S_008F20_PITCH(pitch - 1); + state[4] |= S_008F20_PITCH_GFX6(pitch - 1); if (tex->dcc_offset && first_level < tex->surface.num_dcc_levels) { state[6] |= S_008F28_COMPRESSION_EN(1); diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 47d86d7dbdc..b05152f7d30 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -3000,7 +3000,7 @@ si_make_texture_descriptor(struct si_screen *screen, S_008F1C_TILING_INDEX(tex->fmask.tile_mode_index) | S_008F1C_TYPE(si_tex_dim(res->target, target, 0)); fmask_state[4] = S_008F20_DEPTH(depth - 1) | - S_008F20_PITCH(tex->fmask.pitch_in_pixels - 1); + S_008F20_PITCH_GFX6(tex->fmask.pitch_in_pixels - 1); fmask_state[5] = S_008F24_BASE_ARRAY(first_layer) | S_008F24_LAST_ARRAY(last_layer); fmask_state[6] = 0; |