summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/i915simple
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@tungstengraphics.com>2008-07-13 18:55:38 +0200
committerJakob Bornecrantz <jakob@tungstengraphics.com>2008-07-13 18:55:38 +0200
commit16c2267d55fb14d0ffcb676540345a14ecc0f323 (patch)
tree4b50427ee01064775f3dd49fd1a8fe401ba5aaa7 /src/gallium/drivers/i915simple
parente59086ab91281cafcae094164bf4d8454df337ae (diff)
i915: Ops should not have pushed that
This reverts commit 930a863c4f6f11d0fd5cf396ef76054d52c69b9f.
Diffstat (limited to 'src/gallium/drivers/i915simple')
-rw-r--r--src/gallium/drivers/i915simple/i915_texture.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915simple/i915_texture.c b/src/gallium/drivers/i915simple/i915_texture.c
index 8427d8271a..cf4964b26b 100644
--- a/src/gallium/drivers/i915simple/i915_texture.c
+++ b/src/gallium/drivers/i915simple/i915_texture.c
@@ -79,7 +79,7 @@ static unsigned
power_of_two(unsigned x)
{
unsigned value = 1;
- while (value < x)
+ while (value <= x)
value = value << 1;
return value;
}
@@ -205,8 +205,8 @@ i945_miptree_layout_2d( struct i915_texture *tex )
unsigned nblocksx = pt->nblocksx[0];
unsigned nblocksy = pt->nblocksy[0];
-#if 1 /* used for tiled display targets */
- if (pt->last_level == 0 /*&& pt->bpp == 4*/)
+#if 0 /* used for tiled display targets */
+ if (pt->last_level == 0 && pt->cpp == 4)
if (i915_displaytarget_layout(tex))
return;
#endif