nvfx: Remove util_is_pot in favor of util_is_power_of_two.

This is a follow up to commit 89b2897220.
This commit is contained in:
Vinson Lee 2010-08-28 22:12:55 -07:00
parent b812ff8f9e
commit 1fc396204b
2 changed files with 5 additions and 5 deletions

View file

@ -20,9 +20,9 @@ nvfx_miptree_choose_format(struct nvfx_miptree *mt)
if(no_swizzle < 0)
no_swizzle = debug_get_bool_option("NV40_NO_SWIZZLE", FALSE); /* this will break things on nv30 */
if (!util_is_pot(pt->width0) ||
!util_is_pot(pt->height0) ||
!util_is_pot(pt->depth0) ||
if (!util_is_power_of_two(pt->width0) ||
!util_is_power_of_two(pt->height0) ||
!util_is_power_of_two(pt->depth0) ||
(!nvfx_screen(pt->screen)->is_nv4x && pt->target == PIPE_TEXTURE_RECT)
)
uniform_pitch = 1;
@ -69,7 +69,7 @@ nvfx_miptree_layout(struct nvfx_miptree *mt)
if(!nvfx_screen(pt->screen)->is_nv4x)
{
assert(pt->target == PIPE_TEXTURE_RECT
|| (util_is_pot(pt->width0) && util_is_pot(pt->height0)));
|| (util_is_power_of_two(pt->width0) && util_is_power_of_two(pt->height0)));
}
for (unsigned l = 0; l <= pt->last_level; l++)

View file

@ -61,7 +61,7 @@ nvfx_region_set_format(struct nv04_region* rgn, enum pipe_format format)
default:
{
int shift;
assert(util_is_pot(bits));
assert(util_is_power_of_two(bits));
shift = util_logbase2(bits) - 3;
assert(shift >= 2);
rgn->bpps = 2;