From: Ville Syrjälä Date: Mon, 23 Mar 2015 12:47:24 +0000 (+0200) Subject: i830: Fix collision between I830_UPLOAD_RASTER_RULES and I830_UPLOAD_TEX(0) X-Git-Tag: upstream/17.1.0~15719 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9504740f3e6698d860ac93310a33f51f01c10c4f;p=platform%2Fupstream%2Fmesa.git i830: Fix collision between I830_UPLOAD_RASTER_RULES and I830_UPLOAD_TEX(0) 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ä Reviewed-by: Ian Romanick Cc: "10.6 11.0" --- 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. */