commit | b252c470366118af0db2b4395217bedffb4c2e01 | [log] [tgz] |
---|---|---|
author | David Neto <dneto@google.com> | Wed Nov 30 13:47:17 2016 -0500 |
committer | David Neto <dneto@google.com> | Wed Nov 30 13:58:30 2016 -0500 |
tree | 50389a22d1a3784cba1dcad63c2ccc13efbec10e | |
parent | e9f7d8ac3cda59f2637776eea1dfad0e171fba21 [diff] | |
parent | bd47a9abaefac00be692eae677daed1b977e625c [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc Includes the following: bd47a9a Add Imagination as a vendor and reserve an enum range for them. Test: checkbuild.py on Linux x86; unit tests on Windows Change-Id: I4c03de66c7e8e2170a2bdfeffaba125ec543571e
This repository contains machine-readable files from the SPIR-V Registry. This includes:
Under the include directory, header files are provided according to their own version. Only major and minor version numbers count. For example, the headers for SPIR-V 1.1 are in include/spirv/1.1. Also, the headers for the 1.0 versions of the GLSL.std.450 and OpenCL extended instruction sets are in include/spirv/1.0.
In contrast, the XML registry file has a linear history, so it is not tied to SPIR-V specification versions.
When a new version or revision of the SPIR-V header files are published, the SPIR Working Group will push new commits onto master, updating the files under include. A newer revision of a header file always replaces an older revision of the same version. For example, verison 1.0 Rev 4 of spirv.h
is placed in include/spirv/1.0/spirv.h
and if there is a Rev 5, then it will be placed in the same location.
The SPIR-V XML registry file is updated by the Khronos registrar whenever a new enum range is allocated.
In particular, pull requests that update header files will not be accepted. Issues with the header files should be filed in the issue tracker.
mkdir build cd build cmake .. # Linux cmake --build . --target install-headers # Windows cmake --build . --config Debug --target install-headers
Then, for example, you will have /usr/local/include/spirv/1.0/spirv.h
If you want to install them somewhere else, then use -DCMAKE_INSTALL_PREFIX=/other/path
on the first cmake
command.
A CMake-based project can use the headers without installing, as follows:
add_subdirectory
directive to include this source tree.${SPIRV-Headers_SOURCE_DIR}/include}
in a target_include_directories
directive.#include
directives that explicitly mention the spirv
path component. For example the following uses SPIR-V 1.1 core instructions, and the 1.0 versions of the GLSL.std.450 and OpenCL extended instructions.#include "spirv/1.0/GLSL.std.450.h" #include "spirv/1.0/OpenCL.std.h" #include "spirv/1.1/spirv.hpp"
See also the example subdirectory. But since that example is inside this repostory, it doesn't use and add_subdirectory
directive.
How are different versions published?
All versions are present in the master branch of the repository. They are located in different subdirectories under include/spirv, where the subdirectory at that level encodes the major and minor version number of the relevant spec.
An application should consciously select the targeted spec version number, by naming the specific version in its #include
directives, as above and in the examples.
How do you handle the evolution of extended instruction sets?
Extended instruction sets evolve asynchronously from the core spec. Right now there is only a single version of both the GLSL and OpenCL headers. So we don't yet have a problematic example to resolve.
Copyright (c) 2015-2016 The Khronos Group Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and/or associated documentation files (the "Materials"), to deal in the Materials without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Materials, and to permit persons to whom the Materials are furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Materials. MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.