Mesa (master): swrast: use _mesa_ffs() instead of ffs()

Brian Paul brianp at kemper.freedesktop.org
Tue Oct 25 10:26:47 PDT 2011


Module: Mesa
Branch: master
Commit: e8d0d7893a6e33eb76441fed146deadb39e91ab3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8d0d7893a6e33eb76441fed146deadb39e91ab3

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Oct 25 11:25:55 2011 -0600

swrast: use _mesa_ffs() instead of ffs()

Fixes MSVC build.

---

 src/mesa/swrast/s_texture.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index 80c3070..fb1edb3 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -279,7 +279,7 @@ _swrast_map_textures(struct gl_context *ctx)
 
    /* loop over enabled texture units */
    while (enabledUnits) {
-      GLuint unit = ffs(enabledUnits) - 1;
+      GLuint unit = _mesa_ffs(enabledUnits) - 1;
       struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current;
       
       _swrast_map_texture(ctx, texObj);
@@ -299,7 +299,7 @@ _swrast_unmap_textures(struct gl_context *ctx)
 
    /* loop over enabled texture units */
    while (enabledUnits) {
-      GLuint unit = ffs(enabledUnits) - 1;
+      GLuint unit = _mesa_ffs(enabledUnits) - 1;
       struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current;
       
       _swrast_unmap_texture(ctx, texObj);



More information about the mesa-commit mailing list