Commit Graph

181 Commits

Author SHA1 Message Date
David Anderson
c5d6b82ac8 Merge.
--HG--
rename : content/events/public/nsPLDOMEvent.h => content/events/public/nsAsyncDOMEvent.h
rename : content/events/src/nsPLDOMEvent.cpp => content/events/src/nsAsyncDOMEvent.cpp
2011-12-20 13:42:14 -08:00
David Anderson
281419782d Merge from mozilla-central.
--HG--
rename : browser/components/sessionstore/test/browser/Makefile.in => browser/components/sessionstore/test/Makefile.in
rename : browser/devtools/webconsole/test/browser/Makefile.in => browser/devtools/webconsole/test/Makefile.in
rename : browser/devtools/webconsole/test/browser/browser_gcli_integrate.js => browser/devtools/webconsole/test/browser_gcli_integrate.js
rename : browser/devtools/webconsole/test/browser/browser_gcli_web.js => browser/devtools/webconsole/test/browser_gcli_web.js
rename : browser/devtools/webconsole/test/browser/browser_webconsole_bug_595934_message_categories.js => browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js
rename : browser/devtools/webconsole/test/browser/browser_webconsole_bug_642108_pruneTest.js => browser/devtools/webconsole/test/browser_webconsole_bug_642108_pruneTest.js
rename : browser/devtools/webconsole/test/browser/browser_webconsole_bug_653531_highlighter_console_helper.js => browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
rename : browser/devtools/webconsole/test/browser/test-console-extras.html => browser/devtools/webconsole/test/test-console-extras.html
2011-12-16 15:06:51 -08:00
Benoit Jacob
1b69af79f6 Bug 711592 - Update ANGLE to r924 - no review
Upstream is at http://code.google.com/p/angleproject/
2011-12-18 18:20:45 -05:00
David Anderson
c2b6153525 Merge from mozilla-central (objshrink, yay!)
--HG--
rename : security/manager/ssl/src/nsNSSCallbacks.cpp => security/manager/ssl/src/SSLServerCertVerification.cpp
2011-12-05 16:57:50 -08:00
Benoit Jacob
cf73b0e3b9 Bug 707555 - Update ANGLE to r901 (v1.0) to grab correctness fixes - no review
This is just syncing us with the upstream http://code.google.com/p/angleproject
2011-12-04 17:24:41 -05:00
David Anderson
5c48d7f631 Merge from mozilla-central.
--HG--
rename : gfx/thebes/GLContext.cpp => gfx/gl/GLContext.cpp
rename : gfx/thebes/GLContext.h => gfx/gl/GLContext.h
rename : gfx/thebes/GLContextProviderCGL.mm => gfx/gl/GLContextProviderCGL.mm
rename : gfx/thebes/GLContextProviderEGL.cpp => gfx/gl/GLContextProviderEGL.cpp
rename : gfx/thebes/GLContextProviderGLX.cpp => gfx/gl/GLContextProviderGLX.cpp
rename : gfx/thebes/GLContextProviderOSMesa.cpp => gfx/gl/GLContextProviderOSMesa.cpp
rename : gfx/thebes/GLContextProviderWGL.cpp => gfx/gl/GLContextProviderWGL.cpp
rename : gfx/thebes/GLXLibrary.h => gfx/gl/GLXLibrary.h
rename : gfx/thebes/WGLLibrary.h => gfx/gl/WGLLibrary.h
rename : layout/svg/base/src/nsSVGLeafFrame.cpp => layout/svg/base/src/SVGFELeafFrame.cpp
2011-11-23 15:19:11 -05:00
Jeff Gilbert
b09b159de0 Bug 724476 - Add ANGLE patch file for impl. readpixel format BGRA - r=bjacob 2012-02-24 14:37:06 -08:00
Jeff Gilbert
d4a1b00304 Bug 724476 - ANGLE Bug 294 - Use BGRA/UBYTE as exposed fast format/type for readPixels - r=bjacob 2012-02-24 14:37:06 -08:00
Jeff Gilbert
727633dbc7 Bug 724476 - Add patch for strict ANGLE readpixels behavior - r=bjacob 2012-02-24 14:37:06 -08:00
Jeff Gilbert
66a7e7b7eb Bug 724476 - ANGLE Bug 293 - Enforce readPixels format/type semantics - r=bjacob 2012-02-24 14:37:05 -08:00
David Anderson
1517ff3853 Merge from mozilla-central. 2011-11-04 14:02:27 -07:00
Benoit Jacob
8215f8aa3e Bug 703917 - Upgrade ANGLE to r885 - no review
This is syncing us with the upstream http://code.google.com/p/angleproject
2011-11-19 18:18:59 -05:00
Benoit Jacob
e3f00a8572 Bug 697333 - Update ANGLE to r809 - no review
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.
2011-11-02 00:56:35 -04:00
Benoit Jacob
cb4d4d8b86 Bug 676071 - drop ANGLE patch limiting identifiers to 250 chars - r=jgilbert 2012-03-02 15:42:49 -05:00
Benoit Jacob
e69450ea31 Bug 676071 - ANGLE patch: use SpookyHash to generate mapped ids, instead of a monotonic identifier - r=jgilbert 2012-03-02 15:42:49 -05:00
Ehsan Akhgari
c6b791606b Bug 696889 followup - Remove the two patches which are no longer needed from the tree; rs=bjacob
DONTBUILD
2011-10-25 11:24:04 -04:00
Benoit Jacob
257620bd20 Bug 696889 - Upgrade ANGLE to r802 - no review
This is syncing us with the ANGLE project at

   http://code.google.com/p/angleproject/

Also, with this new ANGLE revision, two WebGL conformance tests are now passing on windows so this patch removes them from failing_tests_windows.txt.

--HG--
rename : gfx/angle/angle-instrinsic-msvc2005.patch => gfx/angle/angle-intrinsic-msvc2005.patch
2011-10-25 08:58:43 -04:00
Benoit Jacob
08064474fb Bug 713266 - Update ANGLE to r930 - no review
No review because this is just syncing us with the upstream
  http://code.google.com/p/angleproject/
2012-01-03 05:01:43 -05:00
Benoit Jacob
566edf06f2 Bug 774755 - 7/8 - ANGLE r1242: update README and local patches - no review 2012-07-25 12:13:45 -04:00
Benoit Jacob
04cc06db27 Bug 774755 - 5/8 - ANGLE r1242: rename one of the two DirectiveHandler.cpp to avoid conflict - r=jgilbert
--HG--
rename : gfx/angle/src/compiler/preprocessor/new/DirectiveHandler.cpp => gfx/angle/src/compiler/preprocessor/new/PreprocessorDirectiveHandler.cpp
2012-07-25 12:13:45 -04:00
Benoit Jacob
952ea36ea4 Bug 774755 - 4/8 - ANGLE r1242: rename one of the two Diagnostics.cpp to avoid conflict - r=jgilbert
--HG--
rename : gfx/angle/src/compiler/preprocessor/new/Diagnostics.cpp => gfx/angle/src/compiler/preprocessor/new/PreprocessorDiagnostics.cpp
2012-07-25 12:13:45 -04:00
Benoit Jacob
ce4326a33d Bug 774755 - 3/8 - ANGLE r1242: reapply/update existing patches - no review
--HG--
rename : gfx/angle/src/compiler/debug.cpp => gfx/angle/src/compiler/compilerdebug.cpp
rename : gfx/angle/src/compiler/debug.h => gfx/angle/src/compiler/compilerdebug.h
2012-07-25 12:13:45 -04:00
Benoit Jacob
8de5dc0d64 Bug 774755 - 2/8 - ANGLE r1242: update our makefiles - r=jgilbert
In particular:
 - ANGLE_USE_NSPR goes away
 - many useless source files removed from libEGL
2012-07-25 12:13:45 -04:00
Benoit Jacob
2a22a3e1f7 Bug 774755 - 1/8 - Update ANGLE to r1242 - no review
--HG--
rename : gfx/angle/src/compiler/compilerdebug.h => gfx/angle/src/compiler/debug.h
2012-07-25 12:13:45 -04:00
Mike Hommey
50456a422a Bug 709914 - Slice out the ANGLE compiler from libxul on Windows. r=khuey,a=philor 2011-12-15 06:40:23 +01:00
Ehsan Akhgari
1f2fca0d4d Bug 694801 - VC11 fails to compile angle because pool_allocator<T> doesn't have operator =; r=bjacob 2011-10-19 10:17:02 -04:00
Jeff Walden
8e58215339 Bug 694709 - Remove $DXSDK_DIR/include from LOCAL_INCLUDES two places in ANGLE code. It's redundant with a sibling $MOZ_DIRECTX_SDK_PATH/include, at best, and at worst if the two conflict (as happens if the more-recently-installed DirectX SDK is not the most recent SDK), building breaks in the middle of ANGLE. r=bjacob
--HG--
extra : rebase_source : 909fa5cd8c1042fab7d2e95693541784d83bd23d
2011-10-14 16:28:14 -07:00
Benoit Jacob
f43b187c10 Bug 658826 - disable optimization in D3DCompiler to avoid freeze bugs - r=jrmuizel
ANGLE's own buildsystem, which Chrome uses, has been doing this for a long time. This aligns us with them.
2011-10-03 23:09:03 -04:00
Benoit Jacob
d0562bfee9 Bug 690735 - upgrade ANGLE to r774 - no review, just syncing with upstream
This doesn't involve any Makefile change so should be relatively safe.

This is needed for:
  * BUILTIN_FUNCTION_EMULATION (r773,774), blocker for 665578
  * extensions validation in shaders (r745), blocker for 684853
  * major performance improvements and bug fixes
2011-10-01 00:03:10 -04:00
Benoit Jacob
7f79f5e7b1 Bug 680840 - Use infallible allocations in GrowAtomTable() - r=dveditz 2011-09-09 18:00:21 -04:00
Benoit Jacob
5de2c95a0d Bug 682506 - Upgrade ANGLE to r740 - r=upstream
I need this now especially as it gets us the shader modification mechanisms to work around Mac GL crashes, see bug 665578

The relevant ANGLE revisions are 734, 738, and 740 fixes a bug in 738.

This also allows us to reset our set of cherrypicked ANGLE revisions which was starting to be very big.
2011-08-30 18:50:05 -04:00
Benoit Jacob
ba4e0394e4 Bug 681400 - import ANGLE r739 - r=upstream 2011-08-24 11:32:17 -04:00
Benoit Jacob
78960e0532 Bug 673075 - import ANGLE r711 - r=upstream
This lets ANGLE reject shaders that have recursive functions.
2011-08-15 15:54:25 -04:00
Benoit Jacob
32d2e69807 Bug 676918 - import ANGLE r719 - r=upstream
This fixes a crash in glReadPixels in some unusual circumstances like after locking and unlocking the screen.
2011-08-15 15:53:46 -04:00
Mounir Lamouri
f03780250a Merging mozilla-central into mozilla-inbound. 2011-08-11 13:09:54 +02:00
Makoto Kato
bcce667983 Bug 616918 - Turn on ANGLE on Win64. r=bjacob 2011-08-11 19:17:54 +09:00
Benoit Jacob
c3bf80c8aa Bug 676315 - ANGLE build problem: d3dx9.h not found unless $DXSDK_DIR points to it - r=joe
In configure, we detect the DXSDK using the windows registry and set MOZ_DIRECTX_SDK_PATH accordingly. This patch fixes a bug whereby we weren't using that to actually find headers, and were relying on the half-universal DXSDK_DIR variable instead, which is not always defined and in case of multiple versions installed may not point to the most recent one.
2011-08-10 18:25:23 -04:00
Benoit Jacob
c3d59e565c Bug 675634 - import ANGLE r712 - r=upstream 2011-08-02 18:06:25 -04:00
Benoit Jacob
d624db447b Bug 675625 - limit GLSL identifiers to 250 characters to work around a NVIDIA bug - r=jrmuizel 2011-08-02 18:06:25 -04:00
Benoit Jacob
06db157d33 Bug 668743 - ANGLE fails to load on WinXP after upgrade from r653 to r686 - r=jrmuizel
This patch implements delay-loading of DWMAPI.DLL to prevent ANGLE's libEGL.dll from failing to load on WinXP where DWMAPI.DLL is not present.
2011-07-27 14:46:14 -04:00
Benoit Jacob
002ad973d9 Bug 646825 - import ANGLE r702 - r=upstream 2011-07-26 11:53:47 -04:00
Benoit Jacob
c4cbfb78a0 Bug 665934 - fix bug: arev was meant instead of amap - r=upstream
This patch has been taken in ANGLE upstream as r699.
2011-06-27 13:27:04 -04:00
Makoto Kato
f73a47bd47 Bug 662726 - Remove unused ANGLE source. r=bjacob 2011-06-13 10:32:34 +09:00
Benoit Jacob
66919c207e Bug 663162 - Update ANGLE to r686 - r=joedrew
Just an ANGLE update, plus updating the list of failed tests on WinXP, also now properly reporting on unexpeced success (using todo(true) instead of ok(false))
2011-06-10 14:59:08 -04:00
Neil Rashbrook
a823051c1e Fix DOS line endings rs=joedrew!
DONTBUILD
2011-05-26 20:41:33 +01:00
Benoit Jacob
2c0eb7e54e Bug 657748 - Update ANGLE to r653 - a=joe
This ANGLE update fixes bugs, brings large performance improvements, and adds major new features that web devs are looking forward to: vertex shader texture lookup and float textures.

http://code.google.com/p/angleproject/

This update is also needed because the version we're currently using is the chrome_m10 branch and that's no longer maintained. This update will make it much easier to apply security fixes if needed.
2011-05-24 11:05:56 -04:00
Matheus Kerschbaum
35f86c76ad Bug 648911 - Remove support for non-libxul builds. r=ted,joedrew 2011-05-23 18:54:47 +02:00
Benoit Jacob
0a4801660a Bug 649233 - Include ANGLE r611. r=joe
--HG--
extra : rebase_source : 7d917f7bdca76e0abbea6ce5ac41154e2285ec79
2011-04-12 00:36:13 -07:00
Benoit Jacob
d78d9c76dd Bug 649233 - Include ANGLE r551. r=joe
--HG--
extra : rebase_source : 0124d3285a5b552b129e7057ce5a7bec23d3f3bf
2011-04-12 00:36:13 -07:00
Joe Drew
8452c3dcf1 Bug 641630 - Write proper makefiles for ANGLE. r=bjacob,khuey,ted
--HG--
extra : rebase_source : ff1657325b7ccb3dede8ab587c16e1749ab28c46
2011-03-29 18:16:39 -04:00
Joe Drew
e8ff106234 Bug 641630 - Rename compiler/debug.{h,cpp} to compiler/compilerdebug.{h,cpp} r=bjacob
--HG--
rename : gfx/angle/src/compiler/debug.cpp => gfx/angle/src/compiler/compilerdebug.cpp
rename : gfx/angle/src/compiler/debug.h => gfx/angle/src/compiler/compilerdebug.h
extra : rebase_source : cc2d21846981ffd28bf0d7215274171569f43bbd
2011-03-29 18:16:39 -04:00
Benoit Jacob
00c9ea8ba6 Bug 641630. r=ted, a=respin 2011-03-17 15:07:16 -04:00
Benoit Jacob
414b73f1d0 Bug 630628 - Extract d3dx9_*.dll and d3dcompiler_*.dll from DirectX SDK at build time, and ship them with the build - r=vlad, a=blocker 2011-02-07 20:11:52 -05:00
Vladimir Vukicevic
1b67db06c8 Bug 630019 - updated ANGLE PBuffers patch (makes ANGLE work again) - r=bjacob, a=blocking2.0 2011-01-31 20:58:21 -05:00
Benoit Jacob
4d334d070e Bug 630019 - fix ANGLE build, find any version of DirectX SDK - r=jag, a=blocking2.0 2011-01-31 20:58:02 -05:00
Mark Banner
ebb839218f Bustage fix follow-up to bug 629538. Fix pedantic error in ShaderLang.h that only shows up in non-IPC builds due to the way IPC disables pedantic. r=bjacob,a=bustage-fix 2011-01-30 15:54:07 +00:00
Benoit Jacob
8b30bae5e3 Bug 629971 - fix non-libXUL build: had damaged and not properly applied angle-shared.patch - r+a=bustage-of-non-libxul-build 2011-01-29 23:43:11 -05:00
Benoit Jacob
e768d50d9e Bug 629538 - Upgrade ANGLE to r550 - 3/3 - r=vlad, a=blocking2.0 2011-01-29 22:31:21 -05:00
Benoit Jacob
2c9eb4a658 Bug 629538 - Upgrade ANGLE to r550 - 2/3 - r=vlad, a=blocking2.0 2011-01-29 22:31:21 -05:00
Benoit Jacob
d5b139d66f Bug 629538 - Upgrade ANGLE to r550 - 1/3 - r=vlad, a=blocking2.0 2011-01-29 22:31:21 -05:00
Vladimir Vukicevic
e24c8b11dd b=618892; [webgl] implement pbuffers in ANGLE for faster interop; r=upstream 2011-01-06 14:07:12 -08:00
Vladimir Vukicevic
fdf0a111fc fix ANGLE build on Android (don't bother with OS detection with NSPR); bustage fix; a=b 2010-12-27 12:25:47 -08:00
Vladimir Vukicevic
7a38ddd560 b=621067; Update angle to r515 to pick up crash fix; r+a=vlad 2010-12-22 15:31:02 -08:00
Vladimir Vukicevic
5a5c544bbf b=619798; upgrade ANGLE to r511; r+a=vlad 2010-12-16 12:49:06 -08:00
Benoit Jacob
eff6d05bfd Bug 618525 - ANGLE leaks locale objects (ANGLE bug 93) - r+a=vlad 2010-12-11 10:13:22 -05:00
Benoit Jacob
7b4994abe3 Bug 597946 - ANGLE compiler freezes on shader with bad #ifdef (ANGLE bug 40) - r=vlad, a=blocking-betaN 2010-12-11 10:13:22 -05:00
Vladimir Vukicevic
8db3cedac7 b=603367; use ANGLE for WebGL on Win32; r=bjacob 2010-12-03 14:44:01 -08:00
Vladimir Vukicevic
fe9026382b b=616290; upgrade ANGLE to r498; r=bjacob 2010-12-03 14:44:01 -08:00
Vladimir Vukicevic
d0b53174f7 b=602396; upgrade ANGLE to r445, mozilla portion; r=bjacob a=b 2010-10-09 12:44:25 -07:00
Vladimir Vukicevic
246057b47c b=602396; upgrade ANGLE to r445 2010-10-09 12:44:25 -07:00
Vladimir Vukicevic
5ff9acda51 b=590244; update ANGLE to r385; r=vlad; a=b 2010-09-01 15:04:51 -04:00
Vladimir Vukicevic
a17454d431 b=583375; update ANGLE to r367, forgot to regenerate parser; r=vlad 2010-07-31 12:04:26 -07:00
Robert Sayre
e015debe36 (b=583450, 583375) Fix ShaderLang.h bustage. Commas at the end of enum lists. 2010-07-31 00:01:14 -07:00
Vladimir Vukicevic
a827c80a2f b=583375; update ANGLE to r367; r=vlad 2010-07-30 15:22:11 -07:00
Ginn Chen
ff09b88ca8 Bug 579856 Failed to build angle code with Sun Studio 12 r=vlad a=joedrew 2010-07-30 18:54:04 +08:00
Jacek Caban
68ad1d7609 Bug 579493 - ANGLE fails to compile on mingw r=vladimir
--HG--
extra : rebase_source : 52992f80a118d5fe124a285ead0a1e4fb53f7df6
2010-07-17 15:49:04 +02:00
Neil Rashbrook
726052be53 Windows static builds failing due to ANGLE changes, r=vlad 2010-07-17 14:22:26 +02:00
Vladimir Vukicevic
e06986f02d Fix ANGLE on gcc shared non-libxul builds, r=irc, and I know it's a CLOSED TREE 2010-07-15 14:38:22 -07:00
Vladimir Vukicevic
ba073872bf b=578938; ANGLE compilation broken for non-libxul shared builds; r=khuey 2010-07-15 12:49:09 -07:00
Vladimir Vukicevic
79bbb0f9ca b=571172; import and use ANGLE GLSL ES shader validator (disabled by default for now); r=joe 2010-07-14 20:52:34 -07:00
Vladimir Vukicevic
d5c4af94ea b=571172; import and use ANGLE GLSL ES shader validator (ANGLE source) 2010-07-14 20:52:32 -07:00