diff --git a/doc/BranchingAndRolling.md b/doc/BranchingAndRolling.md index 19e2abc35..07374b459 100644 --- a/doc/BranchingAndRolling.md +++ b/doc/BranchingAndRolling.md @@ -27,7 +27,7 @@ from the list on the left-hand side, and then click on the "tree" link at the top of the resulting page. Alternatively, you can navigate to `https://chromium.googlesource.com/angle/angle/+//` -- including the terminating forward slash. (e.g. -`https://chromium.googlesource.com/angle/angle/+/master/`) +`https://chromium.googlesource.com/angle/angle/+/main/`) ## Branching ANGLE diff --git a/doc/BuildingAngleForChromiumDevelopment.md b/doc/BuildingAngleForChromiumDevelopment.md index 35fd95a52..e0507ab6e 100644 --- a/doc/BuildingAngleForChromiumDevelopment.md +++ b/doc/BuildingAngleForChromiumDevelopment.md @@ -41,7 +41,7 @@ ninja -j 10 -k1 -C out/Debug ## Working with ANGLE in Chromium -You will also want to work with a local version of ANGLE instead of the version that is pulled in by Chromium's [DEPS](https://chromium.googlesource.com/chromium/src/+/master/DEPS) file. To do this do the following: +You will also want to work with a local version of ANGLE instead of the version that is pulled in by Chromium's [DEPS](https://chromium.googlesource.com/chromium/src/+/main/DEPS) file. To do this do the following: * cd to `chromium/`. One directory above `chromium/src`. Add this to `chromium/.gclient`: diff --git a/doc/ContributingCode.md b/doc/ContributingCode.md index 1fd3daba7..6af8340e9 100644 --- a/doc/ContributingCode.md +++ b/doc/ContributingCode.md @@ -43,10 +43,10 @@ `git cl upload` should warn you if you are missing this step. [gn-build-config]: https://www.chromium.org/developers/gn-build-configuration -[compiler.gni]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/compiler.gni -[libGLESv2.gni]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/libGLESv2.gni -[glslang.l]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/src/compiler/translator/glslang.l -[run_code_generation.py]: https://chromium.googlesource.com/angle/angle/+/refs/heads/master/scripts/run_code_generation.py +[compiler.gni]: https://chromium.googlesource.com/angle/angle/+/refs/heads/main/src/compiler.gni +[libGLESv2.gni]: https://chromium.googlesource.com/angle/angle/+/refs/heads/main/src/libGLESv2.gni +[glslang.l]: https://chromium.googlesource.com/angle/angle/+/refs/heads/main/src/compiler/translator/glslang.l +[run_code_generation.py]: https://chromium.googlesource.com/angle/angle/+/refs/heads/main/scripts/run_code_generation.py ### Testing @@ -198,7 +198,7 @@ about the process. See [the Chromium docs][TBR] for more info. * There are exceptions to these rules. Use your best judgement. -[TBR]: https://chromium.googlesource.com/chromium/src/+/master/docs/code_reviews.md#tbr-to-be-reviewed +[TBR]: https://chromium.googlesource.com/chromium/src/+/main/docs/code_reviews.md#tbr-to-be-reviewed ### Reverting a CL @@ -268,4 +268,4 @@ See also: [Contributing-code]: http://www.chromium.org/developers/contributing-code/ [depot-tools-tutorial]: http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html [Perftest-README]: ../src/tests/perf_tests/README.md -[Owners]: https://chromium.googlesource.com/chromium/src/+/master/docs/code_reviews.md#expectations-of-owners +[Owners]: https://chromium.googlesource.com/chromium/src/+/main/docs/code_reviews.md#expectations-of-owners diff --git a/doc/DebuggingTips.md b/doc/DebuggingTips.md index 45b3f342c..736cd75c5 100644 --- a/doc/DebuggingTips.md +++ b/doc/DebuggingTips.md @@ -144,7 +144,7 @@ angle_libs_suffix = "_ANGLE_DEV" ``` All -[AngleNativeTest](https://chromium.googlesource.com/chromium/src/+/master/third_party/angle/src/tests/test_utils/runner/android/java/src/com/android/angle/test/AngleNativeTest.java) +[AngleNativeTest](https://chromium.googlesource.com/chromium/src/+/main/third_party/angle/src/tests/test_utils/runner/android/java/src/com/android/angle/test/AngleNativeTest.java) based tests share the same activity name, `com.android.angle.test.AngleUnitTestActivity`. Thus, prior to capturing your test trace, the specific test APK must be installed on the device. When you build the test, a test launcher is generated, for example, diff --git a/doc/DevSetup.md b/doc/DevSetup.md index 36f4955ba..b90b809e0 100644 --- a/doc/DevSetup.md +++ b/doc/DevSetup.md @@ -22,11 +22,11 @@ On Windows: * Install the [Windows 10 SDK, latest version](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk). * You can install it through Visual Studio Installer if available. * Required for GN-generated Visual Studio projects, the Debug runtime for D3D11, and the D3D Compiler DLL. - * (optional) See the [Chromium Windows build instructions](https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md) for more info. + * (optional) See the [Chromium Windows build instructions](https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md) for more info. On Linux: - * Install package dependencies by running `install-build-deps.sh` later on. + * Dependencies will be handled later (see `install-build-deps.sh` below). On MacOS: @@ -39,7 +39,7 @@ git clone https://chromium.googlesource.com/angle/angle cd angle python scripts/bootstrap.py gclient sync -git checkout master +git checkout main ``` On Linux only, you need to install all the necessary dependencies before going further by running this command: diff --git a/doc/DevSetupAndroid.md b/doc/DevSetupAndroid.md index adf88b80e..3e6d5325d 100644 --- a/doc/DevSetupAndroid.md +++ b/doc/DevSetupAndroid.md @@ -59,9 +59,9 @@ Build the `chrome_public_apk` target, and follow the [GPU Testing][GPU Testing] `--browser=android-chromium`. Make sure to set your `CHROMIUM_OUT_DIR` environment variable, so that your browser is found, otherwise the tests will use the stock browser. -[AndroidTest]: https://chromium.googlesource.com/chromium/src/+/master/docs/testing/android_test_instructions.md +[AndroidTest]: https://chromium.googlesource.com/chromium/src/+/main/docs/testing/android_test_instructions.md [GPU Testing]: http://www.chromium.org/developers/testing/gpu-testing#TOC-Running-the-GPU-Tests-Locally -[ChromeAndroid]: https://chromium.googlesource.com/chromium/src/+/master/docs/android_build_instructions.md +[ChromeAndroid]: https://chromium.googlesource.com/chromium/src/+/main/docs/android_build_instructions.md [ANGLEChrome]: BuildingAngleForChromiumDevelopment.md ## Using ANGLE as the Android OpenGL ES driver @@ -227,7 +227,7 @@ angle_expose_non_conformant_extensions_and_versions = true ## Command line for launching chrome on Android -[This Makefile](https://github.com/phuang/test/blob/master/chromium/Makefile) contains many useful +[This Makefile](https://github.com/phuang/test/blob/main/chromium/Makefile) contains many useful command lines for launching chrome. Targets run_chrome_public_apk_* is for launching chrome on Android. diff --git a/doc/DirtyBits.md b/doc/DirtyBits.md index 35460ee0d..f7643b3ff 100644 --- a/doc/DirtyBits.md +++ b/doc/DirtyBits.md @@ -74,7 +74,7 @@ Framebuffer- ->Context: onSubjectStateChange Note over Context: cache update --> -![State Change Example](https://raw.githubusercontent.com/google/angle/master/doc/img/StateNotificationExample.svg?sanitize=true) +![State Change Example](https://raw.githubusercontent.com/google/angle/main/doc/img/StateNotificationExample.svg?sanitize=true) We use the [Observer pattern](https://en.wikipedia.org/wiki/Observer_pattern) to implement cache invalidation notifications. See [`Observer.h`](../src/libANGLE/Observer.h). In the example the @@ -87,7 +87,7 @@ framebuffer's completeness. On subsequent draw calls we skip re-validation at mi See the below diagram for the dependency relations between Subjects and Observers. -![State Change Notification Flow](https://raw.githubusercontent.com/google/angle/master/doc/img/StateChangeNotificationFlow.svg?sanitize=true) +![State Change Notification Flow](https://raw.githubusercontent.com/google/angle/main/doc/img/StateChangeNotificationFlow.svg?sanitize=true) ## Back-end specific Optimizations