diff options
| author | Christian König <[email protected]> | 2011-03-04 17:15:43 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-04 17:15:43 +0100 |
| commit | 54f11a27a1ec28fcf9734f4454dee870bc0113f8 (patch) | |
| tree | 2dc71d95b1ad5d2ca966bbb6726fba45b4cfbac1 /src/gallium/drivers/r600 | |
| parent | 0eccb1038a620bc76ba45ac00c293b3e88427510 (diff) | |
| parent | 6838c9ce74f16c765474c0d2b4ae1469dd4a64d5 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 7d3d022d973..16b53a0b2a5 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -424,10 +424,10 @@ struct pipe_resource *r600_texture_create(struct pipe_screen *screen, */ if (force_tiling == -1) { struct r600_screen *rscreen = (struct r600_screen *)screen; - if (r600_get_minor_version(rscreen->radeon) >= 9) - force_tiling = debug_get_bool_option("R600_TILING", TRUE); - else - force_tiling = debug_get_bool_option("R600_TILING", FALSE); + /* reenable when 2D tiling is fixed better */ + /*if (r600_get_minor_version(rscreen->radeon) >= 9) + force_tiling = debug_get_bool_option("R600_TILING", TRUE);*/ + force_tiling = debug_get_bool_option("R600_TILING", FALSE); } if (force_tiling && permit_hardware_blit(screen, templ)) { |