diff options
author | Mark Young <marky@lunarg.com> | 2018-06-04 16:02:05 -0600 |
---|---|---|
committer | Mark Young <marky@lunarg.com> | 2018-06-05 09:49:17 -0600 |
commit | 9bceaac243c298a211b2e095ed0f25b228a837b8 (patch) | |
tree | 85f1209f0baed9e4f7693caf5aa2ac8c1a937170 | |
parent | def523d646391d31c81cce6ed7c1eecd571100de (diff) | |
download | Vulkan-Loader-9bceaac243c298a211b2e095ed0f25b228a837b8.tar.gz Vulkan-Loader-9bceaac243c298a211b2e095ed0f25b228a837b8.tar.bz2 Vulkan-Loader-9bceaac243c298a211b2e095ed0f25b228a837b8.zip |
docs: Remove references to old repo
Remove references to the old repo. Also, remove ninja build steps
since they are no longer valid.
Change-Id: I4a963ec7dc49af2d7d0d186079f0aee78d110d70
-rw-r--r-- | BUILD.md | 27 | ||||
-rw-r--r-- | loader/LoaderAndLayerInterface.md | 2 | ||||
-rw-r--r-- | scripts/loader_genvk.py | 2 |
3 files changed, 5 insertions, 26 deletions
@@ -220,9 +220,6 @@ To get a copy of Google Test, run: ### Linux Build -Example debug build (Note that the update\_external\_sources script used below builds external tools into predefined locations. -See **Loader and Validation Layer Dependencies** for more information and other options): - Switch to the top of the cloned repository directory, create a build directory and generate the make files. When generating the project files, the location to a Vulkan-Headers install @@ -242,12 +239,13 @@ If your build system supports ccache, you can enable that via CMake option `-DUS #### Using the new loader -If you want to test a Vulkan application with the loader you just built, you can +If you want to test a Vulkan application with the loader you just built from the +[Vulkan-Loader repository](https://github.com/KhronosGroup/Vulkan-Loader), you can direct the application to load it from your build directory: export LD_LIBRARY_PATH=<path to your repository root>/build/loader -The `LoaderAndLayerInterface` document in the `loader` folder in this repository +The `LoaderAndLayerInterface.md` document in the `loader` folder in this repository is a specification that describes both how ICDs and layers should be properly packaged, and how developers can point to ICDs and layers within their builds. @@ -457,25 +455,6 @@ To run the loader test script, change to the `build/tests` directory in your Vul ./vk_loader_validation_tests -## Ninja Builds - All Platforms - -The [Qt Creator IDE](https://qt.io/download-open-source/#section-2) can open a root CMakeList.txt -as a project directly, and it provides tools within Creator to configure and generate Vulkan SDK -build files for one to many targets concurrently. -Alternatively, when invoking CMake, use the `-G "Codeblocks - Ninja"` option to generate Ninja build -files to be used as project files for QtCreator - -- Follow the steps defined elsewhere for the OS using the update\_external\_sources script or as - shown in **Loader and Validation Layer Dependencies** below -- Open, configure, and build the glslang CMakeList.txt files. Note that building the glslang - project will provide access to spirv-tools and spirv-headers -- Then do the same with the Vulkan-LoaderAndValidationLayers CMakeList.txt file -- In order to debug with QtCreator, a - [Microsoft WDK: eg WDK 10](http://go.microsoft.com/fwlink/p/?LinkId=526733) is required. - -Note that installing the WDK breaks the MSVC vcvarsall.bat build scripts provided by MSVC, -requiring that the LIB, INCLUDE, and PATHenv variables be set to the WDK paths by some other means - ## Optional software packages - [Cygwin for windows](https://www.cygwin.com/) diff --git a/loader/LoaderAndLayerInterface.md b/loader/LoaderAndLayerInterface.md index 2313ad03..397c57f2 100644 --- a/loader/LoaderAndLayerInterface.md +++ b/loader/LoaderAndLayerInterface.md @@ -2737,7 +2737,7 @@ of discovery. | Field Name | Field Value | |:---:|--------------------| | Android Loader | The loader designed to work primarily for the Android OS. This is generated from a different code-base than the desktop loader. But, in all important aspects, should be functionally equivalent. | -| Desktop Loader | The loader designed to work on Windows, Linux and MacOS. This is generated from a different [code-base](#https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers) than the Android loader. But in all important aspects, should be functionally equivalent. | +| Desktop Loader | The loader designed to work on Windows, Linux and MacOS. This is generated from a different [code-base](#https://github.com/KhronosGroup/Vulkan-Loader) than the Android loader. But in all important aspects, should be functionally equivalent. | | Core Function | A function that is already part of the Vulkan core specification and not an extension. For example, vkCreateDevice(). | | Device Call Chain | The call chain of functions followed for device functions. This call chain for a device function is usually as follows: first the application calls into a loader trampoline, then the loader trampoline calls enabled layers, the final layer calls into the ICD specific to the device. See the [Dispatch Tables and Call Chains](#dispatch-tables-and-call-chains) section for more information | | Device Function | A Device function is any Vulkan function which takes a `VkDevice`, `VkQueue`, `VkCommandBuffer`, or any child of these, as its first parameter. Some Vulkan Device functions are: `vkQueueSubmit`, `vkBeginCommandBuffer`, `vkCreateEvent`. See the [Instance Versus Device](#instance-versus-device) section for more information. | diff --git a/scripts/loader_genvk.py b/scripts/loader_genvk.py index 547db1ff..ab0ce8a2 100644 --- a/scripts/loader_genvk.py +++ b/scripts/loader_genvk.py @@ -110,7 +110,7 @@ def makeGenOpts(args): # Defaults for generating re-inclusion protection wrappers (or not) protectFeature = protect - # LoaderAndValidationLayer Generators + # Loader Generators # Options for dispatch table helper generator genOpts['vk_dispatch_table_helper.h'] = [ DispatchTableHelperOutputGenerator, |