[Mesa-dev] [PATCH 08/20] i915: Fix collision between I830_UPLOAD_RASTER_RULES and I830_UPLOAD_TEX(0)

[Ian Romanick]

This patch seems obviously correct and is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 03/23/2015 05:47 AM, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> I830_UPLOAD_RASTER_RULES and I830_UPLOAD_TEX(0) are trying to occupy
> the same bit. Move the texture bits upwards a bit to make room for
> I830_UPLOAD_RASTER_RULES.
> 
> Now the driver will actually upload the raster rules which is rather
> important to get the provoking vertex right. Fixes the appearance
> of glxgears teeth on gen2.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  src/mesa/drivers/dri/i915/i830_context.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i915/i830_context.h b/src/mesa/drivers/dri/i915/i830_context.h
> index 140f617..92952cf 100644
> --- a/src/mesa/drivers/dri/i915/i830_context.h
> +++ b/src/mesa/drivers/dri/i915/i830_context.h
> @@ -42,10 +42,10 @@
>  #define I830_UPLOAD_STIPPLE          0x4
>  #define I830_UPLOAD_INVARIENT        0x8
>  #define I830_UPLOAD_RASTER_RULES     0x10
> -#define I830_UPLOAD_TEX(i)           (0x10<<(i))
> -#define I830_UPLOAD_TEXBLEND(i)      (0x100<<(i))
> -#define I830_UPLOAD_TEX_ALL          (0x0f0)
> -#define I830_UPLOAD_TEXBLEND_ALL     (0xf00)
> +#define I830_UPLOAD_TEX(i)           (0x0100<<(i))
> +#define I830_UPLOAD_TEXBLEND(i)      (0x1000<<(i))
> +#define I830_UPLOAD_TEX_ALL          (0x0f00)
> +#define I830_UPLOAD_TEXBLEND_ALL     (0xf000)
>  
>  /* State structure offsets - these will probably disappear.
>   */
>