diff options
| author | Carl Worth <cworth@cworth.org> | 2014-01-28 12:51:53 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-01-28 12:51:53 -0800 |
| commit | 31b2e73a2dda40de27485dbbde03a22130cce429 (patch) | |
| tree | 65f02c113b0232eeb1509b80f83515aab2be8990 | |
| parent | df62691a02f07e6fb98e48274eb917ba33c43bac (diff) | |
| download | mesa-31b2e73a2dda40de27485dbbde03a22130cce429.tar.gz | |
cherry-ignore: Ignore several patches not yet ready for the stable branch
The comments describe the reasons for each being excluded.
| -rw-r--r-- | bin/.cherry-ignore | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index 21338f7534e..7fc4ab00353 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -11,3 +11,14 @@ f0f202e6b764be803470e27cba9102f14361ae22 glx: conditionaly build dri3 and presen # the 10.0 branch. See # http://lists.freedesktop.org/archives/mesa-stable/2013-December/000500.html a057b837ddd1c725a7504eedc53c6df05a012773 egl: add HAVE_LIBDRM define, fix EGL X11 platform + +# These don't pick clean, and there's a rumor of a regression. Anuj said he +# would come back with a backported version of these patches if necessary. +3313cc269bd428ca96a132d86da5fddc0f27386a i965: Add an option to ignore sample qualifier +a92e5f7cf63d496ad7830b5cea4bbab287c25b8e i965: Use sample barycentric coordinates with per sample shading +f5cfb4ae21df8eebfc6b86c0ce858b1c0a9160dd i965: Ignore 'centroid' interpolation qualifier in case of persample shading + +# Author requested skipping due to regressions +# Picking it would require at least also picking: +# 73c3c7e3, 3e0e9e3b, c59a605c +b2d1c579bb84a88179072a6a783f8827e218db55 glcpp: Set extension defines after resolving the GLSL version. |