From 038d2607ab759638217ded3bd1b232d389975af5 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 27 Mar 2010 08:58:59 -0600 Subject: mesa: fix deadlock in _mesa_HashFindFreeKeyBlock() Fixes fd.o bug 27340. (cherry picked from commit 8fe3b3f66ae57a1a6eca7f6dcb0455e14ad92075) --- src/mesa/main/hash.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c index 975775469d..f4af3fdcf7 100644 --- a/src/mesa/main/hash.c +++ b/src/mesa/main/hash.c @@ -127,8 +127,8 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table) * * \return pointer to user's data or NULL if key not in table */ -void * -_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key) +static INLINE void * +_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key) { GLuint pos; const struct HashEntry *entry; @@ -137,19 +137,26 @@ _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key) 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; } - _glthread_UNLOCK_MUTEX(table->Mutex); return NULL; } +void * +_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key) +{ + void *res; + assert(table); + _glthread_LOCK_MUTEX(table->Mutex); + res = _mesa_HashLookup_unlocked(table, key); + _glthread_UNLOCK_MUTEX(table->Mutex); + return res; +} /** @@ -447,7 +454,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; -- cgit v1.2.3 From 9903d09f82c525690cd016e7747ba2fe96c6468f Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 27 Mar 2010 08:59:17 -0600 Subject: mesa: move/update hash function comments (cherry picked from commit 535742d75f0096b22d1b8ff203ae561167af18f7) --- src/mesa/main/hash.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c index f4af3fdcf7..b624e6ecac 100644 --- a/src/mesa/main/hash.c +++ b/src/mesa/main/hash.c @@ -120,12 +120,8 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table) /** - * Lookup an entry in the hash table. - * - * \param table the hash table. - * \param key the key. - * - * \return pointer to user's data or NULL if key not in 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) @@ -147,6 +143,15 @@ _mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key) return NULL; } + +/** + * Lookup an entry in the hash table. + * + * \param table the hash table. + * \param key the key. + * + * \return pointer to user's data or NULL if key not in table + */ void * _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key) { -- cgit v1.2.3 From 1b5b04de75f73f0c622429a412f584a368a0803f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 27 Mar 2010 10:07:14 -0700 Subject: identity: Add id_drm.c to SCons build. This was missed in commit f7cbaae13d67c55abe81ac230de37f564365099f. (cherry picked from commit 02ee7c29502966dffa44243bfc8c20c15907b880) --- src/gallium/drivers/identity/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/identity/SConscript b/src/gallium/drivers/identity/SConscript index 7f079dd0a8..2a68891c28 100644 --- a/src/gallium/drivers/identity/SConscript +++ b/src/gallium/drivers/identity/SConscript @@ -5,9 +5,10 @@ env = env.Clone() identity = env.ConvenienceLibrary( target = 'identity', source = [ - 'id_screen.c', 'id_context.c', + 'id_drm.c', 'id_objects.c', + 'id_screen.c', ]) Export('identity') -- cgit v1.2.3 From 1bf67a3b3f220493484fa675b00cb6bf257a0a81 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 27 Mar 2010 14:25:03 -0700 Subject: i965g: Add brw_winsys_debug.c to SCons build. --- src/gallium/drivers/i965/SConscript | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/drivers/i965/SConscript b/src/gallium/drivers/i965/SConscript index 9c2faaf4b4..d900ea2596 100644 --- a/src/gallium/drivers/i965/SConscript +++ b/src/gallium/drivers/i965/SConscript @@ -58,6 +58,7 @@ i965 = env.ConvenienceLibrary( 'brw_vs_emit.c', 'brw_vs_state.c', 'brw_vs_surface_state.c', + 'brw_winsys_debug.c', 'brw_wm.c', # 'brw_wm_constant_buffer.c', 'brw_wm_debug.c', -- cgit v1.2.3 From 6abc3501c6c6d99a6e115cd645cec0c94ff00e1e Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 27 Mar 2010 14:40:41 -0700 Subject: progs/tests: Remove duplicate texcompress2 in SConscript. --- progs/tests/SConscript | 1 - 1 file changed, 1 deletion(-) diff --git a/progs/tests/SConscript b/progs/tests/SConscript index b1c7c99a7b..037a0c35da 100644 --- a/progs/tests/SConscript +++ b/progs/tests/SConscript @@ -9,7 +9,6 @@ glx_progs = [ 'getprocaddress', 'jkrahntest', 'sharedtex', - 'texcompress2', 'texobjshare', ] -- cgit v1.2.3 From cbc99d34b992074e125f183dcc9c1c7471c5becb Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sun, 28 Mar 2010 16:22:44 -0700 Subject: mesa: set version string to 7.7.1 Also set the correct release date. (cherry picked from commit 663642b435af2f8ab4b16360783eb367f42486c3) --- docs/relnotes-7.7.1.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/relnotes-7.7.1.html b/docs/relnotes-7.7.1.html index 46f4cac563..699627d70d 100644 --- a/docs/relnotes-7.7.1.html +++ b/docs/relnotes-7.7.1.html @@ -8,7 +8,7 @@ -

Mesa 7.7.1 Release Notes / March 26, 2010

+

Mesa 7.7.1 Release Notes / March 28, 2010

Mesa 7.7.1 is a bug-fix release. -- cgit v1.2.3 From 11289924b8b93a6649a35fddcaea73f58009378a Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sun, 28 Mar 2010 16:25:47 -0700 Subject: mesa: Add 7.7.1 release MD5 sums (cherry picked from commit 0c88e340499c961cc7a06107a727710a67e280ed) --- docs/relnotes-7.7.1.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/relnotes-7.7.1.html b/docs/relnotes-7.7.1.html index 699627d70d..00b36714cb 100644 --- a/docs/relnotes-7.7.1.html +++ b/docs/relnotes-7.7.1.html @@ -26,7 +26,15 @@ for DRI hardware acceleration.

MD5 checksums

-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
-- cgit v1.2.3 From a6a4613135dc0b93012d3a2b1abcf69f772e4214 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sun, 28 Mar 2010 16:31:08 -0700 Subject: mesa: set version string to 7.8 Also set the correct release date. --- Makefile | 2 +- docs/relnotes-7.8.html | 2 +- src/mesa/main/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7c75d7f833..6e64134112 100644 --- a/Makefile +++ b/Makefile @@ -180,7 +180,7 @@ ultrix-gcc: # Rules for making release tarballs -VERSION=7.8-rc2 +VERSION=7.8 DIRECTORY = Mesa-$(VERSION) LIB_NAME = MesaLib-$(VERSION) DEMO_NAME = MesaDemos-$(VERSION) diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html index eaf3a8d54a..9622d16652 100644 --- a/docs/relnotes-7.8.html +++ b/docs/relnotes-7.8.html @@ -8,7 +8,7 @@ -

Mesa 7.8 Release Notes / March 26, 2010

+

Mesa 7.8 Release Notes / March 28, 2010

Mesa 7.8 is a new development release. diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 23d74ee2c9..2e1d70c461 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -35,7 +35,7 @@ #define MESA_MAJOR 7 #define MESA_MINOR 8 #define MESA_PATCH 0 -#define MESA_VERSION_STRING "7.8-rc2" +#define MESA_VERSION_STRING "7.8" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -- cgit v1.2.3 From ef6736e6466947afc3ea3c3113359cdadfd8c9cd Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sun, 28 Mar 2010 16:33:53 -0700 Subject: intel: Bump intel driver date to reflect status as 2010Q1 release --- src/mesa/drivers/dri/intel/intel_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index c86dd1d0d9..0a7dcb80c6 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -63,7 +63,7 @@ int INTEL_DEBUG = (0); #endif -#define DRIVER_DATE "20091221 DEVELOPMENT" +#define DRIVER_DATE "20100328 2010Q1" #define DRIVER_DATE_GEM "GEM " DRIVER_DATE -- cgit v1.2.3 From dec94903d98e3705a0b92d6e9227854eabb336b5 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sun, 28 Mar 2010 16:35:56 -0700 Subject: mesa: Add 7.8 release MD5 sums --- docs/relnotes-7.8.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html index 9622d16652..1fed087d79 100644 --- a/docs/relnotes-7.8.html +++ b/docs/relnotes-7.8.html @@ -28,7 +28,15 @@ for DRI hardware acceleration.

MD5 checksums

-tbd
+5fcfde5383eccb3e9fd665f08a0ea59b  MesaLib-7.8.tar.gz
+85cb891eecb89aae4fdd3499cccd934b  MesaLib-7.8.tar.bz2
+754f39593006effc1c8ec3c27c2f1296  MesaLib-7.8.zip
+c3869c29fa6c3dbdd763f7428d271e12  MesaDemos-7.8.tar.gz
+9fe8ec184c7f78691e43c4c0a7f97d56  MesaDemos-7.8.tar.bz2
+063a96947f7b83d4ad789c6cf291b184  MesaDemos-7.8.zip
+5f4246756b7daaddb4fb3f970cad1e28  MesaGLUT-7.8.tar.gz
+ca7048a4aa7a437dcc84cc2c7d731336  MesaGLUT-7.8.tar.bz2
+b54581aeb79b585b158d6a32f94feff2  MesaGLUT-7.8.zip
-- cgit v1.2.3 From 2aafbd7c2ae6922edecec6662ebda6c71cc5e404 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 29 Mar 2010 12:01:28 -0600 Subject: docs: fix 7.7.1 release date (cherry picked from commit e6f5ca0fa3bff975f2acb3a825d77f095bc9f43e) --- docs/news.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.html b/docs/news.html index a60d7a87d8..4e4b6976a8 100644 --- a/docs/news.html +++ b/docs/news.html @@ -11,7 +11,7 @@

News

-

March 26, 2010

+

March 28, 2010

Mesa 7.7.1 is released. This is a bug-fix release fixing issues found in the 7.7 release. -- cgit v1.2.3 From 07c6d94cd7272524ef06b2a787667e5d626137d2 Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Tue, 30 Mar 2010 11:50:13 +0200 Subject: glx/dri2: Fix debug build with old dri2proto. Apparently the higher compiler optimization level in non-debug builds was eliminating the unused functions referencing the unresolved DRI2 symbols... --- src/glx/dri2_glx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 5b0f335db6..14788b89be 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -202,6 +202,8 @@ dri2CreateDrawable(__GLXscreenConfigs * psc, return &pdraw->base; } +#ifdef X_DRI2GetMSC + static int dri2DrawableGetMSC(__GLXscreenConfigs *psc, __GLXDRIdrawable *pdraw, int64_t *ust, int64_t *msc, int64_t *sbc) @@ -209,6 +211,11 @@ dri2DrawableGetMSC(__GLXscreenConfigs *psc, __GLXDRIdrawable *pdraw, return DRI2GetMSC(psc->dpy, pdraw->xDrawable, ust, msc, sbc); } +#endif + + +#ifdef X_DRI2WaitMSC + static int dri2WaitForMSC(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc) @@ -225,6 +232,8 @@ dri2WaitForSBC(__GLXDRIdrawable *pdraw, int64_t target_sbc, int64_t *ust, sbc); } +#endif /* X_DRI2WaitMSC */ + static void dri2CopySubBuffer(__GLXDRIdrawable *pdraw, int x, int y, int width, int height) { @@ -448,6 +457,8 @@ dri2GetBuffersWithFormat(__DRIdrawable * driDrawable, return pdraw->buffers; } +#ifdef X_DRI2SwapInterval + static void dri2SetSwapInterval(__GLXDRIdrawable *pdraw, int interval) { @@ -465,6 +476,8 @@ dri2GetSwapInterval(__GLXDRIdrawable *pdraw) return priv->swap_interval; } +#endif /* X_DRI2SwapInterval */ + static const __DRIdri2LoaderExtension dri2LoaderExtension = { {__DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION}, dri2GetBuffers, -- cgit v1.2.3