gecko-dev/gfx/angle
David Anderson 130b34a147 Merge from mozilla-central. 2012-09-07 15:17:11 -07:00
..
build Bug 787653 - Updated ANGLE to r1267 r=upstream 2012-09-07 11:12:54 +02:00
extensions Bug 774755 - 1/8 - Update ANGLE to r1242 - no review 2012-07-25 12:13:45 -04:00
include Bug 774755 - 1/8 - Update ANGLE to r1242 - no review 2012-07-25 12:13:45 -04:00
samples Bug 774755 - 1/8 - Update ANGLE to r1242 - no review 2012-07-25 12:13:45 -04:00
src Bug 787653 - Updated ANGLE to r1267 r=upstream 2012-09-07 11:12:54 +02:00
tests Bug 774755 - 1/8 - Update ANGLE to r1242 - no review 2012-07-25 12:13:45 -04:00
AUTHORS Bug 787653 - Updated ANGLE to r1267 r=upstream 2012-09-07 11:12:54 +02:00
CONTRIBUTORS Bug 774755 - 1/8 - Update ANGLE to r1242 - no review 2012-07-25 12:13:45 -04:00
DEPS Bug 774755 - 1/8 - Update ANGLE to r1242 - no review 2012-07-25 12:13:45 -04:00
LICENSE
LICENSE.preprocessor b=590244; update ANGLE to r385; r=vlad; a=b 2010-09-01 15:04:51 -04:00
Makefile.in Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
README.mozilla Bug 787653 - Updated ANGLE to r1267 r=upstream 2012-09-07 11:12:54 +02:00
angle-abort-on-oom-in-preprocessor.patch Bug 774755 - 7/8 - ANGLE r1242: update README and local patches - no review 2012-07-25 12:13:45 -04:00
angle-enforce-readpixels-spec.patch Bug 774755 - 7/8 - ANGLE r1242: update README and local patches - no review 2012-07-25 12:13:45 -04:00
angle-impl-read-bgra.patch Bug 774755 - 7/8 - ANGLE r1242: update README and local patches - no review 2012-07-25 12:13:45 -04:00
angle-long-identifier-hash-spooky.patch Bug 774755 - 7/8 - ANGLE r1242: update README and local patches - no review 2012-07-25 12:13:45 -04:00
angle-renaming-debug.patch Merge from mozilla-central. 2012-07-26 18:19:02 -07:00
angle-renaming-preprocessor-diagonostics.patch Bug 774755 - 7/8 - ANGLE r1242: update README and local patches - no review 2012-07-25 12:13:45 -04:00
angle-renaming-preprocessor-directivehandler.patch Bug 774755 - 7/8 - ANGLE r1242: update README and local patches - no review 2012-07-25 12:13:45 -04:00
codereview.settings

README.mozilla

This is the ANGLE project, from http://code.google.com/p/angleproject/

Current revision: r1267

== Applied local patches ==

In this order:

  angle-renaming-debug.patch
    rename debug.h to compilerdebug.h to avoid conflict in our makefiles

  angle-renaming-preprocessor-diagonostics.patch
    rename one of the two Diagnostics.cpp to avoid conflict in our makefiles

  angle-renaming-preprocessor-directivehandler.patch
    rename one of the two DirectiveHandler.cpp to avoid conflict in our makefiles

  angle-enforce-readpixels-spec.patch
    see bug 724476

  angle-impl-read-bgra.patch
    see bug 724476

  gfx/angle/angle-long-identifier-hash-spooky.patch
    see bug 676071

  angle-abort-on-oom-in-preprocessor.patch
    see bug 680840. Probably not useful anymore now that we're on the new
    preprocessor, but it doesn't hurt to keep it around a bit longer.

In addition to these patches, the Makefile.in files are ours, they're not present in upsteam ANGLE.
Therefore, changes made to the Makefile.in files should not be stored in the local .patch files.

== How to update this ANGLE copy ==

1. Unapply patches
2. Apply diff with new ANGLE version
3. Reapply patches.
4. Check for changes in src/build_angle.gyp, update our Makefile.in files accordingly. Note that a single file may be recorded in more than one Makefile.

== Visual Studio Solution Files ==

Ignore these. We don't use them anymore. We use custom Makefiles.

== Generated parser code==

Don't bother about that anymore. The parser is now generated and included in the ANGLE svn repo.