diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-03-23 14:47:24 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-09-30 12:49:28 -0700 |
| commit | 9504740f3e6698d860ac93310a33f51f01c10c4f (patch) | |
| tree | f982cca7acaf0da649b6da17b8a237b443660c2b /src/mesa/drivers/dri/i915 | |
| parent | 7b391142e9da6186221a9eb39977e487f079ef72 (diff) | |
| download | external_mesa3d-9504740f3e6698d860ac93310a33f51f01c10c4f.zip external_mesa3d-9504740f3e6698d860ac93310a33f51f01c10c4f.tar.gz external_mesa3d-9504740f3e6698d860ac93310a33f51f01c10c4f.tar.bz2 | |
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ä <ville.syrjala@linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: "10.6 11.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_context.h | 8 |
1 files 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. */ |