diff options
| author | Nir Ekhauz <nir.ekhauz@arm.com> | 2023-02-12 12:07:18 +0200 |
|---|---|---|
| committer | Nir Ekhauz <nir.ekhauz@arm.com> | 2023-02-12 13:39:28 +0200 |
| commit | 5b973740b0903ed070f22c1bcc3bf599db0e4953 (patch) | |
| tree | 59ff076f057aa3ac2d9420956366b8341be65963 | |
| parent | c33a17f103c4e3b15a68bd7164495d98fc894960 (diff) | |
| download | vulkan-wsi-layer-5b973740b0903ed070f22c1bcc3bf599db0e4953.tar.gz vulkan-wsi-layer-5b973740b0903ed070f22c1bcc3bf599db0e4953.tar.bz2 vulkan-wsi-layer-5b973740b0903ed070f22c1bcc3bf599db0e4953.zip | |
Change vulkan wsi project to use "main" branch
Signed-off-by: Nir Ekhauz <nir.ekhauz@arm.com>
Change-Id: I82fa871371bf025a5c181f3b55812a2bee80d566
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | docs/guidelines.md | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -119,7 +119,7 @@ option, as shown above. Copy the shared library `libVkLayer_window_system_integration.so` and JSON configuration `VkLayer_window_system_integration.json` into a Vulkan® -[implicit layer directory](https://github.com/KhronosGroup/Vulkan-Loader/blob/master/docs/LoaderLayerInterface.md#linux-layer-discovery). +[implicit layer directory](https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderLayerInterface.md#linux-layer-discovery). ## Contributing @@ -134,7 +134,7 @@ We are open for contributions. line. By adding this line the contributor certifies the contribution is made under the terms of the [Developer Certificate of Origin (DCO)](DCO.txt). * Questions, bug reports, et cetera are raised and discussed on the issues page. - * Please make merge requests into the master branch. + * Please make merge requests into the main branch. * Code should be formatted with clang-format using the project's .clang-format configuration. diff --git a/docs/guidelines.md b/docs/guidelines.md index 2e4f9ba..373eeee 100644 --- a/docs/guidelines.md +++ b/docs/guidelines.md @@ -19,11 +19,11 @@ error codes, e.g. VK_ERROR_OUT_OF_HOST_MEMORY. A good idea is to introduce a wrapper around the STL container to ensure all exceptions are caught and converted to error codes that are propagated back to the caller. It is highly recommended to use the -[utility classes](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/tree/master/util) provided by the WSI layer +[utility classes](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/tree/main/util) provided by the WSI layer if you need an exception-safe wrapper for STL containers: - * [util::vector](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/blob/master/util/custom_allocator.hpp) - * [util::unordered_map](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/blob/master/util/unordered_map.hpp) - * [util::unordered_set](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/blob/master/util/unordered_set.hpp) + * [util::vector](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/blob/main/util/custom_allocator.hpp) + * [util::unordered_map](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/blob/main/util/unordered_map.hpp) + * [util::unordered_set](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/blob/main/util/unordered_set.hpp) For other helper components provided by the WSI layer please see -[WSI integration document](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/blob/master/wsi/README.md#helpers).
\ No newline at end of file +[WSI integration document](https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer/-/blob/main/wsi/README.md#helpers). |