mesa: Add 7.7.1 release MD5 sums

mesa: set version string to 7.7.1
Also set the correct release date.
2010-03-28 16:25:47 -07:00 · 2010-03-28 16:22:44 -07:00 · 2010-03-27 08:58:02 -06:00 · 2010-03-27 08:55:47 -06:00 · 2010-03-26 18:29:18 +01:00 · 2010-03-26 16:29:59 +01:00
7 changed files with 62 additions and 28 deletions
--- a/2
+++ b/2
@@ -182,7 +182,7 @@ ultrix-gcc:

 # Rules for making release tarballs

-VERSION=7.7.1-rc2
+VERSION=7.7.1
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,6 +10,15 @@

 <H1>News</H1>

+
+<h2>March 26, 2010</h2>
+<p>
+<a href="relnotes-7.7.1.html">Mesa 7.7.1</a> is released.  This is a bug-fix
+release fixing issues found in the 7.7 release.
+</p>
+
+
+
 <h2>December 21, 2009</h2>
 <p>
 <a href="relnotes-7.6.1.html">Mesa 7.6.1</a> is released.  This is a bug-fix
--- a/docs/relnotes-7.7.1.html
+++ b/docs/relnotes-7.7.1.html
@@ -8,7 +8,7 @@

 <body bgcolor="#eeeeee">

-<H1>Mesa 7.7.1 Release Notes / date tbd</H1>
+<H1>Mesa 7.7.1 Release Notes / March 28, 2010</H1>

 <p>
 Mesa 7.7.1 is a bug-fix release.
@@ -26,7 +26,15 @@ for DRI hardware acceleration.

 <h2>MD5 checksums</h2>
 <pre>
-tbd
+3ab0638cfa7ce8157337a229cf0db2c4  MesaLib-7.7.1.tar.gz
+46664d99e03f1e3ac078a7fea02af115  MesaLib-7.7.1.tar.bz2
+4e73ba8abb59aff79485eb95d7cefff7  MesaLib-7.7.1.zip
+bf1b108983995f7a712cf3343df1c918  MesaDemos-7.7.1.tar.gz
+aeb39645d80d656e0adebaa09e5bcd03  MesaDemos-7.7.1.tar.bz2
+01c49b7454fd292244eaf8bdc6ed8cf0  MesaDemos-7.7.1.zip
+37ec6386693dcb6dc770d1efd63a7a93  MesaGLUT-7.7.1.tar.gz
+1e16c85282f843791a21f7bc7b6a1ca8  MesaGLUT-7.7.1.tar.bz2
+d352c9e36a8e4d1059f4abc017b131e0  MesaGLUT-7.7.1.zip
 </pre>


--- a/src/mesa/drivers/dri/swrast/swrast_span.c
+++ b/src/mesa/drivers/dri/swrast/swrast_span.c
@@ -257,7 +257,7 @@ static const GLubyte kernel[16] = {
   struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
 #define INIT_PIXEL_PTR(P, X, Y) \
   GLushort *P = (GLushort *)row;
-#define INC_PIXEL_PTR(P) P += 2
+#define INC_PIXEL_PTR(P) P++
 #define STORE_PIXEL(DST, X, Y, VALUE) \
   STORE_PIXEL_R5G6B5(DST, X, Y, VALUE)
 #define FETCH_PIXEL(DST, SRC) \
--- a/src/mesa/drivers/dri/swrast/swrast_spantemp.h
+++ b/src/mesa/drivers/dri/swrast/swrast_spantemp.h
@@ -37,7 +37,7 @@
 #define _SWRAST_SPANTEMP_ONCE

 static INLINE void
-PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
+PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLvoid *p )
 {
    __DRIcontext *ctx = swrast_context(glCtx);
    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer);
@@ -179,7 +179,8 @@ NAME(put_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
   if (mask) {
      for (i = 0; i < count; i++) {
         if (mask[i]) {
-            RB_TYPE pixel[4];
+            RB_TYPE row[4];
+            INIT_PIXEL_PTR(pixel, x, y);
            STORE_PIXEL(pixel, x + i, y, src[i]);
            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);
         }
@@ -212,7 +213,8 @@ NAME(put_row_rgb)( GLcontext *ctx, struct gl_renderbuffer *rb,
   if (mask) {
      for (i = 0; i < count; i++) {
         if (mask[i]) {
-            RB_TYPE pixel[4];
+            RB_TYPE row[4];
+            INIT_PIXEL_PTR(pixel, x, y);
 #ifdef STORE_PIXEL_RGB
            STORE_PIXEL_RGB(pixel, x + i, y, src[i]);
 #else
@@ -253,7 +255,8 @@ NAME(put_mono_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
   if (mask) {
      for (i = 0; i < count; i++) {
         if (mask[i]) {
-            RB_TYPE pixel[4];
+            RB_TYPE row[4];
+            INIT_PIXEL_PTR(pixel, x, y);
            STORE_PIXEL(pixel, x + i, y, src);
            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);
         }
@@ -285,7 +288,8 @@ NAME(put_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
   ASSERT(mask);
   for (i = 0; i < count; i++) {
      if (mask[i]) {
-         RB_TYPE pixel[4];
+         RB_TYPE row[4];
+         INIT_PIXEL_PTR(pixel, x, y);
         STORE_PIXEL(pixel, x[i], y[i], src[i]);
         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
      }
@@ -307,7 +311,8 @@ NAME(put_mono_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
   ASSERT(mask);
   for (i = 0; i < count; i++) {
      if (mask[i]) {
-         RB_TYPE pixel[4];
+         RB_TYPE row[4];
+         INIT_PIXEL_PTR(pixel, x, y);
         STORE_PIXEL(pixel, x[i], y[i], src);
         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
      }
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -119,6 +119,31 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)



+/**
+ * Lookup an entry in the hash table, without locking.
+ * \sa _mesa_HashLookup
+ */
+static INLINE void *
+_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
+{
+   GLuint pos;
+   const struct HashEntry *entry;
+
+   assert(table);
+   assert(key);
+
+   pos = HASH_FUNC(key);
+   entry = table->Table[pos];
+   while (entry) {
+      if (entry->Key == key) {
+         return entry->Data;
+      }
+      entry = entry->Next;
+   }
+   return NULL;
+}
+
+
 /**
 * Lookup an entry in the hash table.
 * 
@@ -130,28 +155,15 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
 void *
 _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
 {
-   GLuint pos;
-   const struct HashEntry *entry;
-
+   void *res;
   assert(table);
-   assert(key);
-
-   pos = HASH_FUNC(key);
   _glthread_LOCK_MUTEX(table->Mutex);
-   entry = table->Table[pos];
-   while (entry) {
-      if (entry->Key == key) {
-         _glthread_UNLOCK_MUTEX(table->Mutex);
-         return entry->Data;
-      }
-      entry = entry->Next;
-   }
+   res = _mesa_HashLookup_unlocked(table, key);
   _glthread_UNLOCK_MUTEX(table->Mutex);
-   return NULL;
+   return res;
 }


-
 /**
 * Insert a key/pointer pair into the hash table.  
 * If an entry with this key already exists we'll replace the existing entry.
@@ -447,7 +459,7 @@ _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
      GLuint freeStart = 1;
      GLuint key;
      for (key = 1; key != maxKey; key++) {
-	 if (_mesa_HashLookup(table, key)) {
+	 if (_mesa_HashLookup_unlocked(table, key)) {
 	    /* darn, this key is already in use */
 	    freeCount = 0;
 	    freeStart = key+1;
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -32,7 +32,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 7
 #define MESA_PATCH 1
-#define MESA_VERSION_STRING "7.7.1-rc2"
+#define MESA_VERSION_STRING "7.7.1"

 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
Author	SHA1	Message	Date
Ian Romanick	0c88e34049	mesa: Add 7.7.1 release MD5 sums	2010-03-28 16:25:47 -07:00
Ian Romanick	663642b435	mesa: set version string to 7.7.1 Also set the correct release date.	2010-03-28 16:22:44 -07:00
Brian Paul	535742d75f	mesa: move/update hash function comments	2010-03-27 08:58:02 -06:00
Török Edwin	8fe3b3f66a	mesa: fix deadlock in _mesa_HashFindFreeKeyBlock() Fixes fd.o bug 27340.	2010-03-27 08:55:47 -06:00
Michel Dänzer	4cf14fa80b	dri/swrast: Fix frontbuffer rendering. Was broken since the endianness fixes.	2010-03-26 18:29:18 +01:00
Michel Dänzer	6ec259eb17	dri/swrast: Fix missed conversion of one pixel pointer increment. This probably broke the swrast DRI driver when running X in depth 16.	2010-03-26 16:29:59 +01:00
Brian Paul	ca1c8a183d	docs: added news item for 7.7.1 release	2010-03-23 09:19:44 -06:00
Brian Paul	3f3b1094bf	docs: insert expected 7.7.1 release date	2010-03-23 09:19:26 -06:00