mesa: Changes to 'debian-unstable'
Makefile | 2
debian/changelog | 7 ++
docs/news.html | 7 ++
docs/relnotes-7.11.1.html | 8 +-
docs/relnotes-7.11.2.html | 80 ++++++++++++++++++++++++++
docs/relnotes.html | 1
src/mesa/drivers/common/meta.c | 10 +++
src/mesa/drivers/dri/intel/intel_context.c | 31 +++++-----
src/mesa/drivers/dri/intel/intel_screen.c | 89 ++++++++++++++++++++++++++---
src/mesa/drivers/dri/intel/intel_span.c | 3
src/mesa/main/dlist.c | 2
src/mesa/main/teximage.c | 49 ++++++++++-----
src/mesa/main/version.h | 4 -
13 files changed, 244 insertions(+), 49 deletions(-)
New commits:
commit 72573bb823e375af9aa0ad9e6cdd259a31bafab3
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 11 15:43:44 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 7c41095..3a0904b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (7.11.2-1) UNRELEASED; urgency=low
+mesa (7.11.2-1) unstable; urgency=low
* New upstream release:
- Fix a few intel bugs.
- -- Cyril Brulebois <kibi@debian.org> Sun, 11 Dec 2011 15:41:41 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sun, 11 Dec 2011 15:43:40 +0100
mesa (7.11.1-1) unstable; urgency=low
commit d47e4182059f932d67bec2dbd426701bf9600bd9
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 11 15:42:23 2011 +0100
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index b06df2d..7c41095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.11.2-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Fix a few intel bugs.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 11 Dec 2011 15:41:41 +0100
+
mesa (7.11.1-1) unstable; urgency=low
[ Sven Joachim ]
commit ea72e3cda842fc3676ca03a8adf4dcf56cb63e7a
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun Nov 27 13:57:22 2011 -0800
docs: Add 7.11.2 release notes
diff --git a/docs/relnotes-7.11.2.html b/docs/relnotes-7.11.2.html
new file mode 100644
index 0000000..ca0fb70
--- /dev/null
+++ b/docs/relnotes-7.11.2.html
@@ -0,0 +1,80 @@
+<HTML>
+
+<head>
+<TITLE>Mesa Release Notes</TITLE>
+<link rel="stylesheet" type="text/css" href="mesa.css">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+</head>
+
+<BODY>
+
+<body bgcolor="#eeeeee">
+
+<H1>Mesa 7.11.2 Release Notes / November 27, 2011</H1>
+
+<p>
+Mesa 7.11.2 is a bug fix release which fixes bugs found since the 7.11 release.
+</p>
+<p>
+Mesa 7.11 implements the OpenGL 2.1 API, but the version reported by
+glGetString(GL_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 2.1.
+</p>
+<p>
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
+for DRI hardware acceleration.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+TBD
+</pre>
+
+<h2>New features</h2>
+<p>None.</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=43143";>Bug 43143</a> - Mesa 7.11.1 fails to build at main/dlist.c:4532 with error message: "format not a string literal and no format arguments"</li>
+
+<li>Incorrect handling of CopyTexImage from RGBA window to LA texture.</li>
+
+<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=";>Bug </a> - </li> -->
+</ul>
+
+
+<h2>Changes</h2>
+<p>The full set of changes can be viewed by using the following GIT command:</p>
+
+<pre>
+ git log mesa-7.11.1..mesa-7.11.2
+</pre>
+
+<p>Brian Paul (4):
+<ul>
+ <li>mesa: stop using ctx->Driver.CopyTexImage1D/2D() hooks</li>
+ <li>mesa: fix format selection for meta CopyTexSubImage()</li>
+ <li>docs: update news.html and relnotes.html for 7.11.1 release</li>
+ <li>mesa: use format string in _mesa_error() call to silence warning</li>
+</ul></p>
+
+<p>Chad Versace (3):
+<ul>
+ <li>intel: Simplify stencil detiling arithmetic</li>
+ <li>intel: Fix region dimensions for stencil buffers received from DDX</li>
+ <li>intel: Fix separate stencil in builtin DRI2 backend</li>
+</ul></p>
+
+<p>Ian Romanick (4):
+<ul>
+ <li>docs: Add 7.11.1 release md5sums</li>
+ <li>mesa: set version string to 7.11.2-devel</li>
+ <li>mesa: Bump version to 7.11.2 (final)</li>
+</ul></p>
+
+</body>
+</html>
commit 835205e2953a98b1fac400e8e4022a349a7eb18c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun Nov 27 14:02:04 2011 -0800
mesa: Bump version to 7.11.2 (final)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 99f6e88..0fb9cbf 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@ struct gl_context;
#define MESA_MAJOR 7
#define MESA_MINOR 11
#define MESA_PATCH 2
-#define MESA_VERSION_STRING "7.11.2-devel"
+#define MESA_VERSION_STRING "7.11.2"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 2a45566587e2b180c8c78932802028dee684b988
Author: Chad Versace <chad.versace@linux.intel.com>
Date: Tue Nov 15 07:08:49 2011 -0800
intel: Fix separate stencil in builtin DRI2 backend
intelAllocateBuffer() was oblivious to separate stencil buffers. This
patch fixes it to allocate a non-tiled stencil buffer with special pitch,
just as the DDX does.
Without this, any app that attempted to create an EGL surface with stencil
bits would crash. Of course, this affected only environments that used the
builtin DRI2 backend, such as Android and Wayland.
Fixes GLBenchmark2.1 on Android on gen7.
Note: This is a candidate for the 7.11 branch.
Tested-by: Louie Tsaie <louie.tsai@intel.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit 79653c12d6da4d89aaa73e4e8260a84d91f93593)
Conflicts:
src/mesa/drivers/dri/intel/intel_screen.c
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 2a3a601..5ca9b66 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -785,6 +785,54 @@ struct intel_buffer {
struct intel_region *region;
};
+/**
+ * \brief Get tiling format for a DRI buffer.
+ *
+ * \param attachment is the buffer's attachmet point, such as
+ * __DRI_BUFFER_DEPTH.
+ * \param out_tiling is the returned tiling format for buffer.
+ * \return false if attachment is unrecognized or is incompatible with screen.
+ */
+static bool
+intel_get_dri_buffer_tiling(struct intel_screen *screen,
+ uint32_t attachment,
+ uint32_t *out_tiling)
+{
+ if (screen->gen < 4) {
+ *out_tiling = I915_TILING_X;
+ return true;
+ }
+
+ switch (attachment) {
+ case __DRI_BUFFER_DEPTH:
+ case __DRI_BUFFER_DEPTH_STENCIL:
+ case __DRI_BUFFER_HIZ:
+ *out_tiling = I915_TILING_Y;
+ return true;
+ case __DRI_BUFFER_ACCUM:
+ case __DRI_BUFFER_FRONT_LEFT:
+ case __DRI_BUFFER_FRONT_RIGHT:
+ case __DRI_BUFFER_BACK_LEFT:
+ case __DRI_BUFFER_BACK_RIGHT:
+ case __DRI_BUFFER_FAKE_FRONT_LEFT:
+ case __DRI_BUFFER_FAKE_FRONT_RIGHT:
+ *out_tiling = I915_TILING_X;
+ return true;
+ case __DRI_BUFFER_STENCIL:
+ /* The stencil buffer is W tiled. However, we request from the kernel
+ * a non-tiled buffer because the GTT is incapable of W fencing.
+ */
+ *out_tiling = I915_TILING_NONE;
+ return true;
+ default:
+ if(unlikely(INTEL_DEBUG & DEBUG_DRI)) {
+ fprintf(stderr, "error: %s: unrecognized DRI buffer attachment 0x%x\n",
+ __FUNCTION__, attachment);
+ }
+ return false;
+ }
+}
+
static __DRIbuffer *
intelAllocateBuffer(__DRIscreen *screen,
unsigned attachment, unsigned format,
@@ -792,22 +840,45 @@ intelAllocateBuffer(__DRIscreen *screen,
{
struct intel_buffer *intelBuffer;
struct intel_screen *intelScreen = screen->private;
+
uint32_t tiling;
+ uint32_t region_width;
+ uint32_t region_height;
+ uint32_t region_cpp;
+
+ bool ok = true;
+
+ ok = intel_get_dri_buffer_tiling(intelScreen, attachment, &tiling);
+ if (!ok)
+ return NULL;
intelBuffer = CALLOC(sizeof *intelBuffer);
if (intelBuffer == NULL)
return NULL;
- if ((attachment == __DRI_BUFFER_DEPTH ||
- attachment == __DRI_BUFFER_STENCIL ||
- attachment == __DRI_BUFFER_DEPTH_STENCIL) &&
- intelScreen->gen >= 4)
- tiling = I915_TILING_Y;
- else
- tiling = I915_TILING_X;
+ if (attachment == __DRI_BUFFER_STENCIL) {
+ /* The stencil buffer has quirky pitch requirements. From Vol 2a,
+ * 11.5.6.2.1 3DSTATE_STENCIL_BUFFER, field "Surface Pitch":
+ * The pitch must be set to 2x the value computed based on width, as
+ * the stencil buffer is stored with two rows interleaved.
+ * To accomplish this, we resort to the nasty hack of doubling the
+ * region's cpp and halving its height.
+ */
+ region_width = ALIGN(width, 64);
+ region_height = ALIGN(ALIGN(height, 2) / 2, 64);
+ region_cpp = format / 4;
+ } else {
+ region_width = width;
+ region_height = height;
+ region_cpp = format / 8;
+ }
- intelBuffer->region = intel_region_alloc(intelScreen, tiling,
- format / 8, width, height, GL_TRUE);
+ intelBuffer->region = intel_region_alloc(intelScreen,
+ tiling,
+ region_cpp,
+ region_width,
+ region_height,
+ true);
if (intelBuffer->region == NULL) {
FREE(intelBuffer);
commit 68060d6bfdd5b71f592828a476d8314587c684d9
Author: Chad Versace <chad.versace@linux.intel.com>
Date: Tue Nov 15 07:21:25 2011 -0800
intel: Fix region dimensions for stencil buffers received from DDX
I changed the dimensions of the stencil buffer's region, as allocated by
the DDX, at xf86-video-intel commit
commit 3e55f3e88b40471706d5cd45c4df4010f8675c75
dri: Do not tile stencil buffer
But I forgot to make the analogous update to the Intel DRI2 glue in Mesa.
This patch makes that update.
Surprisingly, the mismatch did not cause any bugs. But the mismatch, if
left unfixed, *would* create bugs in the next commit.
Note: This is a candidate for the 7.11 branch.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit 50b33560784dde428fbb5dfe7d428255874c496c)
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 679790f..c148d2b 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -1334,27 +1334,28 @@ intel_process_dri2_buffer_with_separate_stencil(struct intel_context *intel,
buffer->cpp, buffer->pitch);
}
- /*
- * The stencil buffer has quirky pitch requirements. From Section
- * 2.11.5.6.2.1 3DSTATE_STENCIL_BUFFER, field "Surface Pitch":
- * The pitch must be set to 2x the value computed based on width, as
- * the stencil buffer is stored with two rows interleaved.
- * If we neglect to double the pitch, then drm_intel_gem_bo_map_gtt()
- * maps the memory incorrectly.
- *
- * To satisfy the pitch requirement, the X driver hackishly allocated
- * the gem buffer with bpp doubled and height halved. So buffer->cpp is
- * correct, but drawable->height is not.
- */
- int buffer_height = drawable->h;
+ int buffer_width;
+ int buffer_height;
if (buffer->attachment == __DRI_BUFFER_STENCIL) {
- buffer_height /= 2;
+ /* The stencil buffer has quirky pitch requirements. From Section
+ * 2.11.5.6.2.1 3DSTATE_STENCIL_BUFFER, field "Surface Pitch":
+ * The pitch must be set to 2x the value computed based on width, as
+ * the stencil buffer is stored with two rows interleaved.
+ *
+ * To satisfy the pitch requirement, the X driver allocated the region
+ * with the following dimensions.
+ */
+ buffer_width = ALIGN(drawable->w, 64);
+ buffer_height = ALIGN(ALIGN(drawable->h, 2) / 2, 64);
+ } else {
+ buffer_width = drawable->w;
+ buffer_height = drawable->h;
}
struct intel_region *region =
intel_region_alloc_for_handle(intel->intelScreen,
buffer->cpp,
- drawable->w,
+ buffer_width,
buffer_height,
buffer->pitch / buffer->cpp,
buffer->name,
commit fd35fab340ef8a3c166a6352067728e95d351483
Author: Chad Versace <chad.versace@linux.intel.com>
Date: Tue Nov 15 07:10:18 2011 -0800
intel: Simplify stencil detiling arithmetic
When calculating the y offset needed for detiling window system stencil
buffers, replace the term
region->height * 2 + region->height % 2 - 1
with
rb->Height - 1 .
The two terms are incidentally equivalent due to some out-of-date,
incorrect code in the Intel DRI2 glue for DDX. (See
intel_process_dri2_buffer_with_separate_stencil(), line ``buffer_height /=
2;``).
Note: This is a candidate for the 7.11 branch (only the intel_span.c hunk).
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit dc4c3a31c64aae2c3d76ccbd5bf54d04a1d5d041)
Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_span.c
diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c
index 2e1c80c..b1b8d3d 100644
--- a/src/mesa/drivers/dri/intel/intel_span.c
+++ b/src/mesa/drivers/dri/intel/intel_span.c
@@ -141,10 +141,9 @@ intel_set_span_functions(struct intel_context *intel,
struct intel_renderbuffer *irb = intel_renderbuffer(rb); \
uint8_t *buf = irb->region->buffer->virtual; \
unsigned stride = irb->region->pitch; \
- unsigned height = 2 * irb->region->height; \
bool flip = rb->Name == 0; \
int y_scale = flip ? -1 : 1; \
- int y_bias = flip ? (height - 1) : 0; \
+ int y_bias = flip ? (rb->Height - 1) : 0; \
#undef Y_FLIP
#define Y_FLIP(y) (y_scale * (y) + y_bias)
commit 658d994473dcfbff140e43178253bbcf438af797
Author: Brian Paul <brianp@vmware.com>
Date: Tue Oct 18 18:59:13 2011 -0600
mesa: use format string in _mesa_error() call to silence warning
(cherry picked from commit 5485192fc81ab40ffdbfb1c74346d887c3c03231)
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index eb314be..6301da3 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -4529,7 +4529,7 @@ static GLvoid *copy_data(const GLvoid *data, GLsizei size, const char *func)
image = malloc(size);
if (!image) {
- _mesa_error(ctx, GL_OUT_OF_MEMORY, func);
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
return NULL;
}
memcpy(image, data, size);
commit 8a8ccc00b527995b1dc400f0eba984bde2ccca9e
Author: Brian Paul <brianp@vmware.com>
Date: Mon Nov 21 09:16:38 2011 -0700
docs: update news.html and relnotes.html for 7.11.1 release
diff --git a/docs/news.html b/docs/news.html
index 70b38c6..dbd4933 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,6 +11,13 @@
<H1>News</H1>
+<h2>November 17, 2011</h2>
+
+<p>
+<a href="relnotes-7.11.1.html">Mesa 7.11.1</a> is released. This is a bug fix
+release.
+</p>
+
<h2>July 31, 2011</h2>
<p>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index e1f0c32..1057bd1 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -13,6 +13,7 @@ The release notes summarize what's new or changed in each Mesa release.
</p>
<UL>
+<LI><A HREF="relnotes-7.11.1.html">7.11.1 release notes</A>
<LI><A HREF="relnotes-7.11.html">7.11 release notes</A>
<LI><A HREF="relnotes-7.10.3.html">7.10.3 release notes</A>
<LI><A HREF="relnotes-7.10.2.html">7.10.2 release notes</A>
commit 21364bd09d6133f5da12986678fa995fa0aea7e4
Author: Brian Paul <brianp@vmware.com>
Date: Thu Jul 28 09:51:30 2011 -0600
mesa: fix format selection for meta CopyTexSubImage()
When we do a glReadPixels into the temporary buffer, we don't want to
use GL_LUMINANCE, GL_LUMINANCE_ALPHA or GL_INTENSITY since they will
compute L=R+G+B which is not what we want.
This bug has existed all along but was only exposed by the elimination
of the driver hook for glCopyTexImage() in
5874890c26f434f54e9218b83fae4eb8175c24e9.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=39604
Tested-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit e4fdc95277bd323d8945e20635d3a1702a2e695d)
(cherry-pick note: This patch and the one before it combine to fix
CopyTexImage from RGBA window to LA texture. This was believed to
already be fixed by commit 296e6b9, but these changes were also
necessary.)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index a578797..48df1f5 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -2842,6 +2842,16 @@ copy_tex_sub_image(struct gl_context *ctx,
/* Choose format/type for temporary image buffer */
format = _mesa_get_format_base_format(texImage->TexFormat);
+ if (format == GL_LUMINANCE ||
+ format == GL_LUMINANCE_ALPHA ||
+ format == GL_INTENSITY) {
+ /* We don't want to use GL_LUMINANCE, GL_INTENSITY, etc. for the
+ * temp image buffer because glReadPixels will do L=R+G+B which is
+ * not what we want (should be L=R).
+ */
+ format = GL_RGBA;
+ }
+
type = get_temp_image_type(ctx, format);
bpp = _mesa_bytes_per_pixel(format, type);
if (bpp <= 0) {
commit 6b2c771dddf2e766b35404765bdf5a9b355d11ed
Author: Brian Paul <brianp@vmware.com>
Date: Tue Jul 19 20:03:05 2011 -0600
mesa: stop using ctx->Driver.CopyTexImage1D/2D() hooks
(cherry picked from commit 5874890c26f434f54e9218b83fae4eb8175c24e9)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 55f90a9..65adb0e 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2816,29 +2816,43 @@ copyteximage(struct gl_context *ctx, GLuint dims,
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);
}
else {
- gl_format texFormat;
-
- if (texImage->Data) {
- ctx->Driver.FreeTexImageData( ctx, texImage );
- }
+ /* choose actual hw format */
+ gl_format texFormat = _mesa_choose_texture_format(ctx, texObj,
+ target, level,
+ internalFormat,
+ GL_NONE, GL_NONE);
- ASSERT(texImage->Data == NULL);
+ if (legal_texture_size(ctx, texFormat, width, height, 1)) {
+ GLint srcX = x, srcY = y, dstX = 0, dstY = 0;
- texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,
- internalFormat, GL_NONE,
- GL_NONE);
+ /* Free old texture image */
+ ctx->Driver.FreeTexImageData(ctx, texImage);
- if (legal_texture_size(ctx, texFormat, width, height, 1)) {
_mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
border, internalFormat, texFormat);
- ASSERT(ctx->Driver.CopyTexImage2D);
- if (dims == 1)
- ctx->Driver.CopyTexImage1D(ctx, target, level, internalFormat,
- x, y, width, border);
- else
- ctx->Driver.CopyTexImage2D(ctx, target, level, internalFormat,
- x, y, width, height, border);
+ /* Allocate texture memory (no pixel data yet) */
+ if (dims == 1) {
+ ctx->Driver.TexImage1D(ctx, target, level, internalFormat,
+ width, border, GL_NONE, GL_NONE, NULL,
+ &ctx->Unpack, texObj, texImage);
+ }
+ else {
+ ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
+ width, height, border, GL_NONE, GL_NONE,
+ NULL, &ctx->Unpack, texObj, texImage);
+ }
+
+ if (_mesa_clip_copytexsubimage(ctx, &dstX, &dstY, &srcX, &srcY,
+ &width, &height)) {
+ if (dims == 1)
+ ctx->Driver.CopyTexSubImage1D(ctx, target, level, dstX,
+ srcX, srcY, width);
+
+ else
+ ctx->Driver.CopyTexSubImage2D(ctx, target, level, dstX, dstY,
+ srcX, srcY, width, height);
+ }
check_gen_mipmap(ctx, target, texObj, level);
@@ -2849,6 +2863,7 @@ copyteximage(struct gl_context *ctx, GLuint dims,
ctx->NewState |= _NEW_TEXTURE;
}
else {
+ /* probably too large of image */
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);
}
}
commit 22ff4ec9693d6a4b03c770cffd0446ad4fff0ab4
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Nov 18 11:06:33 2011 -0800
mesa: set version string to 7.11.2-devel
diff --git a/Makefile b/Makefile
index b3bf837..cd42090 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,7 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.11.1
+VERSION=7.11.2
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
GLUT_NAME = MesaGLUT-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 83338b2..99f6e88 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -34,8 +34,8 @@ struct gl_context;
/* Mesa version */
#define MESA_MAJOR 7
#define MESA_MINOR 11
-#define MESA_PATCH 1
-#define MESA_VERSION_STRING "7.11.1"
+#define MESA_PATCH 2
+#define MESA_VERSION_STRING "7.11.2-devel"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 228da884c9bfe9258cc26e741f41b273aa3e668a
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Nov 17 12:12:34 2011 -0800
docs: Add 7.11.1 release md5sums
diff --git a/docs/relnotes-7.11.1.html b/docs/relnotes-7.11.1.html
index 73a654a..3941baa 100644
--- a/docs/relnotes-7.11.1.html
+++ b/docs/relnotes-7.11.1.html
@@ -28,10 +28,14 @@ for DRI hardware acceleration.
<h2>MD5 checksums</h2>
<pre>
-TBD
+ac0181a4076770fb657c1169af43aa09 MesaLib-7.11.1.tar.gz
+a77307102cee844ff6544ffa8fafeac1 MesaLib-7.11.1.tar.bz2
+dfcb11516c1730f3981b55a65a835623 MesaLib-7.11.1.zip
+2cb2b9ecb4fb7d1a6be69346ee886952 MesaGLUT-7.11.1.tar.gz
+3f54e314290d4dacbab089839197080b MesaGLUT-7.11.1.tar.bz2
+5d66c7ee8c5cc2f27e1ffb037ad4172c MesaGLUT-7.11.1.zip
</pre>
-
<h2>New features</h2>
<p>None.</p>
Reply to: