docs: Replace references to DevSim with Profiles
Updated the docs to better reflect the behavior of vulkaninfo and
remove references to DevSim.
diff --git a/icd/README.md b/icd/README.md
index 5554bfc..1c6e6ea 100644
--- a/icd/README.md
+++ b/icd/README.md
@@ -13,12 +13,6 @@
The intial mock driver features just the null driver capability. This allows all of the validation tests to be run
on a fixed device configuration that is hard-coded into the ICD.
-### Device Configuration
-Device configuration can be added by running the DevSim layer below the validation layers, but above the mock driver.
-The current plan is that if device customization beyond DevSim's capabilities are required for validation layer testing
-then the DevSim layer will be enhanced with the required features. The mock layer itself is just planned to have some
-hard-coded device settings that will enable it to run all of the validation tests.
-
### Entrypoint Tracking & Verification
Entrypoint tracking and verification will be added to the mock layer as a later feature. The idea is that all expected
Vulkan function calls and their parameters can be stored in the ICD and then a separate call can be made to verify that
@@ -31,14 +25,13 @@
## Plans
-The initial mock ICD is just the null driver which can be used in combination with DevSim to test validation layers on
+The initial mock ICD is just the null driver which can be used to test validation layers on
simulated devices. Here's a rough sequence of tasks planned for the mock driver going forward:
- [X] Get all LVL tests passing on the bare null driver
- [X] Get failing tests passing
- [X] Get skipped tests passing as able
- [ ] Get all LVL tests to run without unexpected errors
- [X] Develop automated test flow using mock ICD (alternative to or replacement for run\_all\_tests.sh)
-- [X] Get all LVL tests to pass on a selection of device profiles using DevSim layer
- [ ] Update LVL tests with device dependencies to target specific device profiles
- [ ] Add entrypoint tracking & verification
- [ ] Initially track expected calls
diff --git a/vulkaninfo/json_validation_process.md b/vulkaninfo/json_validation_process.md
index 9434528..a469533 100644
--- a/vulkaninfo/json_validation_process.md
+++ b/vulkaninfo/json_validation_process.md
@@ -1,21 +1,17 @@
# Validating [vulkaninfo](https://github.com/KhronosGroup/Vulkan-Tools/tree/master/vulkaninfo) JSON output
-The format of vulkaninfo's JSON output is designed to be used as input to the LunarG
-[Device Simulation](https://github.com/LunarG/VulkanTools/blob/master/layersvt/device_simulation.md)
-(DevSim) layer.
-When changes are made to vulkaninfo's JSON output, the formatting should be
-validated against DevSim's JSON schema, to ensure the text is correctly
-formatted.
+The format of vulkaninfo's JSON output is designed to be used as input for the
+[Vulkan Profiles](https://github.com/KhronosGroup/Vulkan-Profiles)
+solution.
-The DevSim JSON schema specifies exactly how its JSON input data must
-be structured.
-The schema may be found at
-https://schema.khronos.org/vulkan/devsim_1_0_0.json
+The Vulkan Profiles JSON schema specifies exactly how the JSON must be structured.
+The schemas may be found at [here](https://schema.khronos.org/vulkan/).
+Select the latest schema that `vulkaninfo` was designed to be used with, or simply take the latest available schema.
-## Steps to validate JSON data against the DevSim schema
+## Steps to validate JSON data against the Vulkan Profiles schema
-1. Generate the text to be tested using `vulkaninfo --json` and save to a file.
-1. Download the [DevSim schema](https://schema.khronos.org/vulkan/devsim_1_0_0.json) to another file.
+1. Generate the text to be tested using `vulkaninfo --json` which creates a `.json` file automatically.
+1. Download the [Vulkan Profiles schema](https://schema.khronos.org/vulkan/) to another file.
1. For each of the on-line JSON validator tools listed below:
1. Paste the schema and and sample text into the `schema` and `data` fields.
1. Depending on the tool, it may validate automatically, or require clicking a `validate` button.
@@ -23,16 +19,6 @@
## List of recommended JSON validator tools
-Each of these tools seem to have their own quirks and/or holes in coverage.
-I recommend using all of them, ensuring they all report that the data successfully
-validates against the schema.
* https://www.jsonschemavalidator.net/
* https://jsonschemalint.com/#/version/draft-04/markup/json
* https://json-schema-validator.herokuapp.com/index.jsp
-
-If you have suggestions for better tools
-(e.g.: an official reference validator,
-an automatable tool to integrate with continuous integration)
-please create an
-[issue](https://github.com/KhronosGroup/Vulkan-Tools/issues)
-to recommend it.
diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp
index c5dc923..4e92341 100644
--- a/vulkaninfo/vulkaninfo.cpp
+++ b/vulkaninfo/vulkaninfo.cpp
@@ -868,8 +868,9 @@
" \"vulkaninfo.html\" in the directory in which the command\n"
" is run.\n"
"[-j, --json] Produce a json version of vulkaninfo output conforming to the Vulkan\n"
- " Profiles schema, saved as \"vulkaninfo.json\", of the first gpu in the\n"
- " system.\n"
+ " Profiles schema, saved as \n"
+ " \"VP_VULKANINFO_[DEVICE_NAME]_[DRIVER_VERSION].json\"\n"
+ " of the first gpu in the system.\n"
"[-j=<gpu-number>, --json=<gpu-number>]\n"
" For a multi-gpu system, a single gpu can be targetted by\n"
" specifying the gpu-number associated with the gpu of \n"
diff --git a/vulkaninfo/vulkaninfo.md b/vulkaninfo/vulkaninfo.md
index 4e093e5..7f1f287 100644
--- a/vulkaninfo/vulkaninfo.md
+++ b/vulkaninfo/vulkaninfo.md
@@ -41,11 +41,11 @@
```
vulkaninfo --json
```
+Produce a json version of vulkaninfo output conforming to the [Vulkan Profiles schema](https://schema.khronos.org/vulkan/), saved as \"VP_VULKANINFO_[DEVICE_NAME]_[DRIVER_VERSION].json\", of the first gpu in the system.
- Use the `--json` option to produce [DevSim-schema](https://schema.khronos.org/vulkan/devsim_1_0_0.json)-compatible JSON output for your device. Additionally, JSON output can be specified with the `-j` option and for multi-GPU systems, a single GPU can be targeted using the `--json=`*`GPU-number`* option where the *`GPU-number`* indicates the GPU of interest (e.g., `--json=0`). To determine the GPU number corresponding to a particular GPU, execute `vulkaninfo` with the `--html` option (or none at all) first; doing so will summarize all GPUs in the system.
- The generated configuration information can be used as input for the [`VK_LAYER_LUNARG_device_simulation`](./device_simulation_layer.html) layer.
+JSON output can be specified with the `-j` option and for multi-GPU systems, a single GPU can be targeted using the `--json=`*`GPU-number`* option where the *`GPU-number`* indicates the GPU of interest (e.g., `--json=0`). To determine the GPU number corresponding to a particular GPU, execute `vulkaninfo --summary` option (or none at all) first; doing so will summarize all GPUs in the system.
- Use the `--help` or `-h` option to produce a list of all available Vulkan Info options.
+Use the `--help` or `-h` option to produce a list of all available Vulkan Info options.
```
vulkaninfo - Summarize Vulkan information in relation to the current environment.
@@ -71,8 +71,9 @@
\"vulkaninfo.html\" in the directory in which the command
is run.
[-j, --json] Produce a json version of vulkaninfo output conforming to the Vulkan
- Profiles schema, saved as \"vulkaninfo.json\", of the first gpu in the
- system.
+ Profiles schema, saved as
+ \"VP_VULKANINFO_[DEVICE_NAME]_[DRIVER_VERSION].json\"
+ of the first gpu in the system.
[-j=<gpu-number>, --json=<gpu-number>]
For a multi-gpu system, a single gpu can be targetted by
specifying the gpu-number associated with the gpu of
