mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
133 lines
4.7 KiB
Diff
133 lines
4.7 KiB
Diff
# HG changeset patch
|
|
# Parent 85ffde53712cab3c217bbbf0c1ec9b7ec2ae8ea6
|
|
|
|
diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in
|
|
--- a/gfx/angle/Makefile.in
|
|
+++ b/gfx/angle/Makefile.in
|
|
@@ -127,16 +127,18 @@ CSRCS = \
|
|
$(NULL)
|
|
|
|
DEFINES += -DANGLE_USE_NSPR -DANGLE_BUILD -DCOMPILER_IMPLEMENTATION
|
|
|
|
#these defines are from ANGLE's build_angle.gyp
|
|
DEFINES += -DANGLE_DISABLE_TRACE
|
|
DEFINES += -DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0
|
|
|
|
+EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB)
|
|
+
|
|
ifdef MOZ_ANGLE
|
|
|
|
# libEGL depends on (links against!) libGLESv2!
|
|
DIRS = src/libGLESv2 src/libEGL
|
|
|
|
libs::
|
|
expand "$(MOZ_D3DX9_CAB)" -F:$(MOZ_D3DX9_DLL) "$(DIST)/bin"
|
|
expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin"
|
|
diff --git a/gfx/angle/README.mozilla b/gfx/angle/README.mozilla
|
|
--- a/gfx/angle/README.mozilla
|
|
+++ b/gfx/angle/README.mozilla
|
|
@@ -3,16 +3,17 @@ This is the ANGLE project, from http://c
|
|
Current revision: r885
|
|
|
|
== Applied local patches ==
|
|
|
|
In this order:
|
|
angle-renaming-debug.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-limit-identifiers-to-250-chars.patch - see bug 675625
|
|
+ angle-use-xmalloc.patch - see bug 680840. Can drop this patch whenever the new preprocessor lands.
|
|
|
|
In addition to these patches, the Makefile.in files are ours, they're not present in upsteam ANGLE.
|
|
|
|
== How to update this ANGLE copy ==
|
|
|
|
1. Unapply patches
|
|
2. Apply diff with new ANGLE version
|
|
3. Reapply patches.
|
|
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
|
|
@@ -48,16 +48,18 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILI
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "compiler/compilerdebug.h"
|
|
#include "compiler/preprocessor/slglobals.h"
|
|
|
|
+#include "../../../../../memory/mozalloc/mozalloc.h"
|
|
+
|
|
#undef malloc
|
|
#undef realloc
|
|
#undef free
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////// String table: //////////////////////////////////////
|
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
@@ -318,31 +320,23 @@ static int AddAtomFixed(AtomTable *atabl
|
|
*/
|
|
|
|
static int GrowAtomTable(AtomTable *atable, int size)
|
|
{
|
|
int *newmap, *newrev;
|
|
|
|
if (atable->size < size) {
|
|
if (atable->amap) {
|
|
- newmap = realloc(atable->amap, sizeof(int)*size);
|
|
- newrev = realloc(atable->arev, sizeof(int)*size);
|
|
+ newmap = moz_xrealloc(atable->amap, sizeof(int)*size);
|
|
+ newrev = moz_xrealloc(atable->arev, sizeof(int)*size);
|
|
} else {
|
|
- newmap = malloc(sizeof(int)*size);
|
|
- newrev = malloc(sizeof(int)*size);
|
|
+ newmap = moz_xmalloc(sizeof(int)*size);
|
|
+ newrev = moz_xmalloc(sizeof(int)*size);
|
|
atable->size = 0;
|
|
}
|
|
- if (!newmap || !newrev) {
|
|
- /* failed to grow -- error */
|
|
- if (newmap)
|
|
- atable->amap = newmap;
|
|
- if (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;
|
|
}
|
|
return 0;
|
|
} // GrowAtomTable
|
|
diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in
|
|
--- a/gfx/angle/src/libEGL/Makefile.in
|
|
+++ b/gfx/angle/src/libEGL/Makefile.in
|
|
@@ -153,8 +153,10 @@ RCFILE = $(srcdir)/libEGL.rc
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
EXTRA_DSO_LDOPTS = "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib" \
|
|
"$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/dxguid.lib" \
|
|
"$(DIST)/lib/libGLESv2.lib" \
|
|
dwmapi.lib \
|
|
delayimp.lib \
|
|
/delayload:dwmapi.dll
|
|
+
|
|
+EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
|
|
diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in
|
|
--- a/gfx/angle/src/libGLESv2/Makefile.in
|
|
+++ b/gfx/angle/src/libGLESv2/Makefile.in
|
|
@@ -162,8 +162,10 @@ CPPSRCS += \
|
|
DEFFILE = $(srcdir)/libGLESv2.def
|
|
RCFILE = $(srcdir)/libGLESv2.rc
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
EXTRA_DSO_LDOPTS = "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib" \
|
|
"$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3dx9.lib" \
|
|
"$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/D3DCompiler.lib"
|
|
+
|
|
+EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
|