util: remove util_is_pot in favor of util_is_power_of_two
The function was duplicated.
This commit is contained in:
@@ -538,7 +538,7 @@ lp_build_mul_imm(struct lp_build_context *bld,
|
||||
if(b == 2 && bld->type.floating)
|
||||
return lp_build_add(bld, a, a);
|
||||
|
||||
if(util_is_pot(b)) {
|
||||
if(util_is_power_of_two(b)) {
|
||||
unsigned shift = ffs(b) - 1;
|
||||
|
||||
if(bld->type.floating) {
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
boolean
|
||||
lp_check_alignment(const void *ptr, unsigned alignment)
|
||||
{
|
||||
assert(util_is_pot(alignment));
|
||||
assert(util_is_power_of_two(alignment));
|
||||
return ((uintptr_t)ptr & (alignment - 1)) == 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -388,7 +388,7 @@ lp_build_fetch_rgba_aos(LLVMBuilderRef builder,
|
||||
|
||||
if (format_matches_type(format_desc, type) &&
|
||||
format_desc->block.bits <= type.width * 4 &&
|
||||
util_is_pot(format_desc->block.bits)) {
|
||||
util_is_power_of_two(format_desc->block.bits)) {
|
||||
LLVMValueRef packed;
|
||||
|
||||
/*
|
||||
@@ -416,7 +416,7 @@ lp_build_fetch_rgba_aos(LLVMBuilderRef builder,
|
||||
format_desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS) &&
|
||||
format_desc->block.width == 1 &&
|
||||
format_desc->block.height == 1 &&
|
||||
util_is_pot(format_desc->block.bits) &&
|
||||
util_is_power_of_two(format_desc->block.bits) &&
|
||||
format_desc->block.bits <= 32 &&
|
||||
format_desc->is_bitmask &&
|
||||
!format_desc->is_mixed &&
|
||||
|
||||
@@ -82,9 +82,9 @@ lp_sampler_static_state(struct lp_sampler_static_state *state,
|
||||
state->swizzle_a = view->swizzle_a;
|
||||
|
||||
state->target = texture->target;
|
||||
state->pot_width = util_is_pot(texture->width0);
|
||||
state->pot_height = util_is_pot(texture->height0);
|
||||
state->pot_depth = util_is_pot(texture->depth0);
|
||||
state->pot_width = util_is_power_of_two(texture->width0);
|
||||
state->pot_height = util_is_power_of_two(texture->height0);
|
||||
state->pot_depth = util_is_power_of_two(texture->depth0);
|
||||
|
||||
state->wrap_s = sampler->wrap_s;
|
||||
state->wrap_t = sampler->wrap_t;
|
||||
|
||||
@@ -360,16 +360,6 @@ util_is_inf_or_nan(float x)
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Test whether x is a power of two.
|
||||
*/
|
||||
static INLINE boolean
|
||||
util_is_pot(unsigned x)
|
||||
{
|
||||
return (x & (x - 1)) == 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Find first bit set in word. Least significant bit is 1.
|
||||
* Return 0 if no bits set.
|
||||
|
||||
@@ -140,7 +140,7 @@ galahad_screen_resource_create(struct pipe_screen *_screen,
|
||||
|
||||
if(templat->target != PIPE_TEXTURE_RECT && templat->target != PIPE_BUFFER && !screen->get_param(screen, PIPE_CAP_NPOT_TEXTURES))
|
||||
{
|
||||
if(!util_is_pot(templat->width0) || !util_is_pot(templat->height0))
|
||||
if(!util_is_power_of_two(templat->width0) || !util_is_power_of_two(templat->height0))
|
||||
glhd_warn("Requested NPOT (%ux%u) non-rectangle texture without NPOT support", templat->width0, templat->height0);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user