mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
e3f00a8572
This is just syncing us with the upstream, http://code.google.com/p/angleproject/ This gets us two important fixes, for bug 676071 and bug 694495.
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
# HG changeset patch
|
|
# Parent e8b87ef36a1dae3bbd7abb13c4bb0a0bb8f5b58c
|
|
diff --git a/gfx/angle/README.mozilla b/gfx/angle/README.mozilla
|
|
--- a/gfx/angle/README.mozilla
|
|
+++ b/gfx/angle/README.mozilla
|
|
@@ -2,16 +2,17 @@ This is the ANGLE project, from http://c
|
|
|
|
Current revision: r802
|
|
|
|
== 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
|
|
|
|
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/length_limits.h b/gfx/angle/src/compiler/preprocessor/length_limits.h
|
|
--- a/gfx/angle/src/compiler/preprocessor/length_limits.h
|
|
+++ b/gfx/angle/src/compiler/preprocessor/length_limits.h
|
|
@@ -10,12 +10,14 @@
|
|
|
|
#if !defined(__LENGTH_LIMITS_H)
|
|
#define __LENGTH_LIMITS_H 1
|
|
|
|
// These constants are factored out from the rest of the headers to
|
|
// make it easier to reference them from the compiler sources.
|
|
|
|
// These lengths do not include the NULL terminator.
|
|
-#define MAX_SYMBOL_NAME_LEN 256
|
|
+// see bug 675625: NVIDIA driver crash with lengths >= 253
|
|
+// this is only an interim fix, the real fix is name mapping, see ANGLE bug 144 / r619
|
|
+#define MAX_SYMBOL_NAME_LEN 250
|
|
#define MAX_STRING_LEN 511
|
|
|
|
#endif // !(defined(__LENGTH_LIMITS_H)
|