diff options
| author | Richard Li <richardradeon@gmail.com> | 2009-11-19 16:17:13 -0500 |
|---|---|---|
| committer | Richard Li <richardradeon@gmail.com> | 2009-11-19 16:17:13 -0500 |
| commit | 49b3f4a6bc498d964296f7305b490ec983b9fac4 (patch) | |
| tree | b56c8899e2db1a9f2a7a97da038ec943a93daed9 /src/mesa/drivers/dri/intel/intel_mipmap_tree.c | |
| parent | 6345a7ba447d3e04b939ead6fee44fe9201ec2e3 (diff) | |
| parent | 90e69c81e445136b7d14c569cab5b517b8073498 (diff) | |
Merge branch 'master' of ssh://richardradeon@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_mipmap_tree.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index abb3024bfb..6a565f80cf 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -224,16 +224,12 @@ int intel_miptree_pitch_align (struct intel_context *intel, if (!mt->compressed) { int pitch_align; - if (intel->ttm) { - /* XXX: Align pitch to multiple of 64 bytes for now to allow - * render-to-texture to work in all cases. This should probably be - * replaced at some point by some scheme to only do this when really - * necessary. - */ - pitch_align = 64; - } else { - pitch_align = 4; - } + /* XXX: Align pitch to multiple of 64 bytes for now to allow + * render-to-texture to work in all cases. This should probably be + * replaced at some point by some scheme to only do this when really + * necessary. + */ + pitch_align = 64; if (tiling == I915_TILING_X) pitch_align = 512; |