diff options
| author | Michel Dänzer <[email protected]> | 2012-05-16 23:52:19 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2012-05-16 23:52:19 +0200 |
| commit | 7446a0407d4e61a826385c11ed6c401837baf095 (patch) | |
| tree | baf62a7f3b96590731e183a6cc1c75ab53192928 /src/gallium/drivers | |
| parent | 03e3bc4ba56f1021899a5f773b6ec21893619e3a (diff) | |
gallium/radeon: Fix r300g tiling breakage.
Commit 11f056a3f0b87e86267efa8b5ac9d36a343c9dc1 broke the r300g build. Fix it
up, and reinstate some code which isn't needed by r600g and radeonsi but is
by r300g.
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/r600_texture.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 812fe39155a..e025c2fcd1e 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -713,6 +713,7 @@ static void r300_tex_set_tiling_flags(struct r300_context *r300, tex->tex.macrotile[level]) { r300->rws->buffer_set_tiling(tex->buf, r300->cs, tex->tex.microtile, tex->tex.macrotile[level], + 0, 0, 0, 0, 0, tex->tex.stride_in_bytes[0]); tex->surface_level = level; diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index c9af04fac5d..6901722f6c1 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -917,6 +917,7 @@ r300_texture_create_object(struct r300_screen *rscreen, rws->buffer_set_tiling(tex->buf, NULL, tex->tex.microtile, tex->tex.macrotile[0], + 0, 0, 0, 0, 0, tex->tex.stride_in_bytes[0]); return tex; diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 7a55d8e9d05..d6f85c38c32 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -451,6 +451,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen, struct r600_screen *rscreen = (struct r600_screen*)screen; rscreen->ws->buffer_set_tiling(resource->buf, + NULL, surface->level[0].mode >= RADEON_SURF_MODE_1D ? RADEON_LAYOUT_TILED : RADEON_LAYOUT_LINEAR, surface->level[0].mode >= RADEON_SURF_MODE_2D ? diff --git a/src/gallium/drivers/radeonsi/r600_texture.c b/src/gallium/drivers/radeonsi/r600_texture.c index 80d5c7c0ee3..8a62d68ff86 100644 --- a/src/gallium/drivers/radeonsi/r600_texture.c +++ b/src/gallium/drivers/radeonsi/r600_texture.c @@ -461,6 +461,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen, struct r600_screen *rscreen = (struct r600_screen*)screen; rscreen->ws->buffer_set_tiling(resource->buf, + NULL, surface->level[0].mode >= RADEON_SURF_MODE_1D ? RADEON_LAYOUT_TILED : RADEON_LAYOUT_LINEAR, surface->level[0].mode >= RADEON_SURF_MODE_2D ? |