Use SPIR-V headers from the KhronosGroup/SPIRV-Headers repo. #186
Conversation
antiagainst
force-pushed
the
header-repo
branch
from
0433db8
to
274cddf
Compare
| @@ -54,9 +54,9 @@ We intend to maintain a linear history on the GitHub `master` branch. | |||
| * `external/googletest`: Intended location for the | |||
| [googletest][googletest] sources, not provided | |||
| * `include/`: API clients should add this directory to the include search path | |||
| * `external/SPIRV-Headers`: Intended location for | |||
| [SPIR-V headers][spirv-headers], not provided | |||
There was a problem hiding this comment.
Why is the second one lower case?
There was a problem hiding this comment.
It's just ref'ing the footnote. :)
|
In principle, this is good. Don't we need a corresponding change in google/shaderc to react to the rename of the .inc file? Also, we need to make an AOSP repository for SPIRV-Headers, and update the manifest for the NDK to include it. -1 Can't include this change until the above are staged as well. |
|
@dneto0: we don't need to do anything in google/shaderc for .inc files, but we do need to add build steps to pull SPIRV-Headers there. See google/shaderc#203. |
| @@ -161,23 +168,16 @@ function(spvtools_opencl_tables VERSION) | |||
| add_custom_target(spirv-tools-build-opencl-tables-${VERSION} | |||
| ${PYTHON_EXECUTABLE} | |||
| ${CMAKE_CURRENT_SOURCE_DIR}/utils/generate_grammar_tables.py | |||
| --spirv-core-grammar=${spirv-tools_SOURCE_DIR}/source/spirv-${VERSION}.core.grammar.json | |||
| --spirv-core-grammar=${SPIRV_HEADER_INCLUDE_DIR}/spirv/${VERSION}/spirv.core.grammar.json | |||
There was a problem hiding this comment.
Don't forget to rebase this against #183 (or the other way around).
antiagainst
force-pushed
the
header-repo
branch
from
274cddf
to
57f051d
Compare
|
LGTM, though still gated on AOSP work... |
antiagainst
force-pushed
the
header-repo
branch
2 times, most recently
from
78141e7
to
0f92d7a
Compare
|
LGTM. |
|
@dneto0: at the time of my comment, the manifest branch still hadn't included SPIRV-Headers, so |
|
@antiagainst : please rebase |
|
@dneto0: done |
|
Sorry, needs another rebase. |
|
@dneto0: done |
|
+2 |
|
Rebased and pushed into master as 10dba91 |
No description provided.