From f8e4542bad7dd9bb97b2990947ef74dbb2ee75e4 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 6 Dec 2019 09:20:09 -0800 Subject: replace _mesa_logbase2 with util_logbase2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Kristian H. Kristensen Reviewed-by: Matt Turner Part-of: --- src/mesa/drivers/dri/i965/brw_clip.c | 2 +- src/mesa/drivers/dri/i965/brw_vs.c | 2 +- src/mesa/drivers/dri/radeon/radeon_texture.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index 49c41d8c2e4..082724c82d1 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.c +++ b/src/mesa/drivers/dri/i965/brw_clip.c @@ -112,7 +112,7 @@ brw_upload_clip_prog(struct brw_context *brw) key.pv_first = (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION); /* _NEW_TRANSFORM (also part of VUE map)*/ if (ctx->Transform.ClipPlanesEnabled) - key.nr_userclip = _mesa_logbase2(ctx->Transform.ClipPlanesEnabled) + 1; + key.nr_userclip = util_logbase2(ctx->Transform.ClipPlanesEnabled) + 1; if (devinfo->gen == 5) key.clip_mode = BRW_CLIP_MODE_KERNEL_CLIP; diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 6ce7a1ce889..b2e8c2225bd 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -265,7 +265,7 @@ brw_vs_populate_key(struct brw_context *brw, (ctx->API == API_OPENGL_COMPAT || ctx->API == API_OPENGLES) && vp->program.info.clip_distance_array_size == 0) { key->nr_userclip_plane_consts = - _mesa_logbase2(ctx->Transform.ClipPlanesEnabled) + 1; + util_logbase2(ctx->Transform.ClipPlanesEnabled) + 1; } if (devinfo->gen < 6) { diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index a2c43aa7b5b..3bf7a0dbec3 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -681,7 +681,7 @@ static radeon_mipmap_tree *radeon_miptree_create_for_teximage(radeonContextPtr r texImage->Level == firstLevel) { lastLevel = firstLevel; } else { - lastLevel = firstLevel + _mesa_logbase2(MAX2(MAX2(width, height), depth)); + lastLevel = firstLevel + util_logbase2(MAX2(MAX2(width, height), depth)); } } -- cgit v1.2.3