OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.8'

Browse Source 
Conflicts:
	Makefile
	src/mesa/main/version.h

Resolved by keeping version strings from master (also in the intel driver).
This commit is contained in:
Michel Dänzer
2010-03-30 12:01:31 +02:00
parent aa1a790360 07c6d94cd7
commit e5c7d1e1c8
7 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/news.html
View File

@@ -11,7 +11,7 @@
<H1>News</H1> <H1>News</H1>
<h2>March 26, 2010</h2> <h2>March 28, 2010</h2>
<p> <p>
<a href="relnotes-7.7.1.html">Mesa 7.7.1</a> is released. This is a bug-fix <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. release fixing issues found in the 7.7 release.

12
docs/relnotes-7.7.1.html
View File

@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee"> <body bgcolor="#eeeeee">
<H1>Mesa 7.7.1 Release Notes / March 26, 2010</H1> <H1>Mesa 7.7.1 Release Notes / March 28, 2010</H1>
<p> <p>
Mesa 7.7.1 is a bug-fix release. Mesa 7.7.1 is a bug-fix release.
@@ -26,7 +26,15 @@ for DRI hardware acceleration.
<h2>MD5 checksums</h2> <h2>MD5 checksums</h2>
<pre> <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> </pre>

12
docs/relnotes-7.8.html
View File

@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee"> <body bgcolor="#eeeeee">
<H1>Mesa 7.8 Release Notes / March 26, 2010</H1> <H1>Mesa 7.8 Release Notes / March 28, 2010</H1>
<p> <p>
Mesa 7.8 is a new development release. Mesa 7.8 is a new development release.
@@ -28,7 +28,15 @@ for DRI hardware acceleration.
<h2>MD5 checksums</h2> <h2>MD5 checksums</h2>
<pre> <pre>
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
</pre> </pre>

1
progs/tests/SConscript
View File

@@ -9,7 +9,6 @@ glx_progs = [
'getprocaddress', 'getprocaddress',
'jkrahntest', 'jkrahntest',
'sharedtex', 'sharedtex',
'texcompress2',
'texobjshare', 'texobjshare',
] ]

1
src/gallium/drivers/i965/SConscript
View File

@@ -58,6 +58,7 @@ i965 = env.ConvenienceLibrary(
'brw_vs_emit.c', 'brw_vs_emit.c',
'brw_vs_state.c', 'brw_vs_state.c',
'brw_vs_surface_state.c', 'brw_vs_surface_state.c',
'brw_winsys_debug.c',
'brw_wm.c', 'brw_wm.c',
# 'brw_wm_constant_buffer.c', # 'brw_wm_constant_buffer.c',
'brw_wm_debug.c', 'brw_wm_debug.c',

13
src/glx/dri2_glx.c
View File

@@ -202,6 +202,8 @@ dri2CreateDrawable(__GLXscreenConfigs * psc,
return &pdraw->base; return &pdraw->base;
} }
#ifdef X_DRI2GetMSC
static int static int
dri2DrawableGetMSC(__GLXscreenConfigs *psc, __GLXDRIdrawable *pdraw, dri2DrawableGetMSC(__GLXscreenConfigs *psc, __GLXDRIdrawable *pdraw,
int64_t *ust, int64_t *msc, int64_t *sbc) 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); return DRI2GetMSC(psc->dpy, pdraw->xDrawable, ust, msc, sbc);
} }
#endif
#ifdef X_DRI2WaitMSC
static int static int
dri2WaitForMSC(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor, dri2WaitForMSC(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor,
int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc) 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); sbc);
} }
#endif /* X_DRI2WaitMSC */
static void static void
dri2CopySubBuffer(__GLXDRIdrawable *pdraw, int x, int y, int width, int height) dri2CopySubBuffer(__GLXDRIdrawable *pdraw, int x, int y, int width, int height)
{ {
@@ -448,6 +457,8 @@ dri2GetBuffersWithFormat(__DRIdrawable * driDrawable,
return pdraw->buffers; return pdraw->buffers;
} }
#ifdef X_DRI2SwapInterval
static void static void
dri2SetSwapInterval(__GLXDRIdrawable *pdraw, int interval) dri2SetSwapInterval(__GLXDRIdrawable *pdraw, int interval)
{ {
@@ -465,6 +476,8 @@ dri2GetSwapInterval(__GLXDRIdrawable *pdraw)
return priv->swap_interval; return priv->swap_interval;
} }
#endif /* X_DRI2SwapInterval */
static const __DRIdri2LoaderExtension dri2LoaderExtension = { static const __DRIdri2LoaderExtension dri2LoaderExtension = {
{__DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION}, {__DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION},
dri2GetBuffers, dri2GetBuffers,

46
src/mesa/main/hash.c
View File

@@ -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. * Lookup an entry in the hash table.
* *
@@ -130,28 +155,15 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
void * void *
_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key) _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
{ {
GLuint pos; void *res;
const struct HashEntry *entry;
assert(table); assert(table);
assert(key);
pos = HASH_FUNC(key);
_glthread_LOCK_MUTEX(table->Mutex); _glthread_LOCK_MUTEX(table->Mutex);
entry = table->Table[pos]; res = _mesa_HashLookup_unlocked(table, key);
while (entry) {
if (entry->Key == key) {
_glthread_UNLOCK_MUTEX(table->Mutex);
return entry->Data;
}
entry = entry->Next;
}
_glthread_UNLOCK_MUTEX(table->Mutex); _glthread_UNLOCK_MUTEX(table->Mutex);
return NULL; return res;
} }
/** /**
* Insert a key/pointer pair into the hash table. * Insert a key/pointer pair into the hash table.
* If an entry with this key already exists we'll replace the existing entry. * 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 freeStart = 1;
GLuint key; GLuint key;
for (key = 1; key != maxKey; 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 */ /* darn, this key is already in use */
freeCount = 0; freeCount = 0;
freeStart = key+1; freeStart = key+1;