summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2010-08-28 22:12:55 -0700
committerVinson Lee <[email protected]>2010-08-28 22:12:55 -0700
commit1fc396204b5676d7ebdbc20089d6442ab3dbcef4 (patch)
tree558c8e466cf49d957650063a053467abc3478320 /src/gallium
parentb812ff8f9e5c9d292c0fb9518df1d35165542556 (diff)
nvfx: Remove util_is_pot in favor of util_is_power_of_two.
This is a follow up to commit 89b2897220acfacdc431f138377fbcec9f0ea812.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nvfx/nvfx_miptree.c8
-rw-r--r--src/gallium/drivers/nvfx/nvfx_surface.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_miptree.c b/src/gallium/drivers/nvfx/nvfx_miptree.c
index 46e1f9e4f48..0916aaa8289 100644
--- a/src/gallium/drivers/nvfx/nvfx_miptree.c
+++ b/src/gallium/drivers/nvfx/nvfx_miptree.c
@@ -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++)
diff --git a/src/gallium/drivers/nvfx/nvfx_surface.c b/src/gallium/drivers/nvfx/nvfx_surface.c
index f6cc9856737..a5931b6e152 100644
--- a/src/gallium/drivers/nvfx/nvfx_surface.c
+++ b/src/gallium/drivers/nvfx/nvfx_surface.c
@@ -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;