wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 665934 - fix bug: arev was meant instead of amap - r=upstream

Browse Source 
This patch has been taken in ANGLE upstream as r699.
This commit is contained in:
Benoit Jacob 2011-06-27 13:27:04 -04:00
parent d306fc19a7
commit c4cbfb78a0
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/angle/README.mozilla
View File

@ -8,6 +8,7 @@ In this order:
angle-nspr-misc.patch - don't bother with ANGLE_OS detection with NSPR
angle-renaming.patch - rename debug.h to compilerdebug.h to avoid conflict in our makefiles
angle-intrinsic-msvc2005.patch - work around a MSVC 2005 compile error
angle-amap-arev-fix.patch - plain bug fix, this is ANGLE r699
In addition to these patches, the Makefile.in files are ours, they're not present in upsteam ANGLE.

28
gfx/angle/angle-amap-arev-fix.patch Normal file
View File

@ -0,0 +1,28 @@
# HG changeset patch
# Parent c88f8e8921fb6399cf95b5899d2acc60951dddd1
Bug 665934 - fix bug: arev was meant instead of amap - r=upstream
This patch has been taken in ANGLE upstream as r699.
diff --git a/gfx/angle/src/compiler/preprocessor/atom.c b/gfx/angle/src/compiler/preprocessor/atom.c
--- a/gfx/angle/src/compiler/preprocessor/atom.c
+++ b/gfx/angle/src/compiler/preprocessor/atom.c
@@ -330,17 +330,17 @@ static int GrowAtomTable(AtomTable *atab
newrev = malloc(sizeof(int)*size);
atable->size = 0;
}
if (!newmap || !newrev) {
/* failed to grow -- error */
if (newmap)
atable->amap = newmap;
if (newrev)
- atable->amap = newrev;
+ atable->arev = newrev;
return -1;
}
memset(&newmap[atable->size], 0, (size - atable->size) * sizeof(int));
memset(&newrev[atable->size], 0, (size - atable->size) * sizeof(int));
atable->amap = newmap;
atable->arev = newrev;
atable->size = size;
}

2
gfx/angle/src/compiler/preprocessor/atom.c
View File

@ -335,7 +335,7 @@ static int GrowAtomTable(AtomTable *atable, int size)
if (newmap)
atable->amap = newmap;
if (newrev)
atable->amap = newrev;
atable->arev = newrev;
return -1;
}
memset(&newmap[atable->size], 0, (size - atable->size) * sizeof(int));