diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-03-23 14:47:24 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-10-07 14:46:00 +0100 |
| commit | fbcd36ddb6a75e3ba10f391856641b5eb9a2a50e (patch) | |
| tree | a26b724ac6eaa93ed8e403211bdf86938c51f13b | |
| parent | 531309a5f05a2b56cb9c30b1fbdd85233c275169 (diff) | |
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>
(cherry picked from commit 9504740f3e6698d860ac93310a33f51f01c10c4f)
| -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 140f617e007..92952cf61b3 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. */ |