[Mesa-dev] i915: Fix build error.

Submitted by Iago Toral Quiroga on April 8, 2014, 7:27 a.m.

Details

Message ID 1396942038-15252-1-git-send-email-itoral@igalia.com
State Accepted
Commit dff3439fef8690192bcc40108729da711fcf706b
Headers show

Not browsing as part of any series.

Commit Message

Iago Toral Quiroga April 8, 2014, 7:27 a.m.
is_power_of_two() is now provided by mesa so its definition must be removed
from the i915 driver code.
---
 src/mesa/drivers/dri/i915/intel_context.h | 6 ------
 1 file changed, 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index 94960f6..fccf821 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -504,12 +504,6 @@  intel_context(struct gl_context * ctx)
    return (struct intel_context *) ctx;
 }
 
-static INLINE bool
-is_power_of_two(uint32_t value)
-{
-   return (value & (value - 1)) == 0;
-}
-
 #ifdef __cplusplus
 }
 #endif

Comments

On 04/08/2014 12:27 AM, Iago Toral Quiroga wrote:
> is_power_of_two() is now provided by mesa so its definition must be removed
> from the i915 driver code.
> ---
>  src/mesa/drivers/dri/i915/intel_context.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
> index 94960f6..fccf821 100644
> --- a/src/mesa/drivers/dri/i915/intel_context.h
> +++ b/src/mesa/drivers/dri/i915/intel_context.h
> @@ -504,12 +504,6 @@ intel_context(struct gl_context * ctx)
>     return (struct intel_context *) ctx;
>  }
>  
> -static INLINE bool
> -is_power_of_two(uint32_t value)
> -{
> -   return (value & (value - 1)) == 0;
> -}
> -
>  #ifdef __cplusplus
>  }
>  #endif
> 

Yikes, sorry.  I remembered to build Gallium, but left my
--with-dri-drivers=i965 flag in place.  Thanks for the fix.

R-b and pushed.