Fix #2059, and also attempt to skip test bots [skip ci]
This commit is contained in:
parent
9e9099cdf8
commit
3ed344dd78
@ -17,6 +17,20 @@ branches:
|
|||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
# changes to these files don't need to trigger testing
|
||||||
|
skip_commits:
|
||||||
|
files:
|
||||||
|
- README.md
|
||||||
|
- README-spirv-remap.txt
|
||||||
|
- LICENSE.txt
|
||||||
|
- CODE_OF_CONDUCT.md
|
||||||
|
- BUILD.*
|
||||||
|
- WORKSPACE
|
||||||
|
- kokoro/*
|
||||||
|
- make-revision
|
||||||
|
- Android.mk
|
||||||
|
- _config.yml
|
||||||
|
|
||||||
# Travis advances the master-tot tag to current top of the tree after
|
# Travis advances the master-tot tag to current top of the tree after
|
||||||
# each push into the master branch, because it relies on that tag to
|
# each push into the master branch, because it relies on that tag to
|
||||||
# upload build artifacts to the master-tot release. This will cause
|
# upload build artifacts to the master-tot release. This will cause
|
||||||
|
10
README.md
10
README.md
@ -35,7 +35,7 @@ Deprecations
|
|||||||
`${CMAKE_INSTALL_INCLUDEDIR}`. This `SPIRV` folder is being moved to
|
`${CMAKE_INSTALL_INCLUDEDIR}`. This `SPIRV` folder is being moved to
|
||||||
`glslang/SPIRV`. During the transition the `SPIRV` folder will be installed into
|
`glslang/SPIRV`. During the transition the `SPIRV` folder will be installed into
|
||||||
both locations. The old install of `SPIRV/` will be removed as a CMake install
|
both locations. The old install of `SPIRV/` will be removed as a CMake install
|
||||||
target no sooner then May 1, 2020. See issue #1964.
|
target no sooner than May 1, 2020. See issue #1964.
|
||||||
|
|
||||||
Execution of Standalone Wrapper
|
Execution of Standalone Wrapper
|
||||||
-------------------------------
|
-------------------------------
|
||||||
@ -185,7 +185,7 @@ Use the steps in [Build Steps](#build-steps), with the following notes/exception
|
|||||||
+ turn on `-DENABLE_GLSLANG_WEB=ON`
|
+ turn on `-DENABLE_GLSLANG_WEB=ON`
|
||||||
+ optionally, for GLSL compilation error messages, turn on `-DENABLE_GLSLANG_WEB_DEVEL=ON`
|
+ optionally, for GLSL compilation error messages, turn on `-DENABLE_GLSLANG_WEB_DEVEL=ON`
|
||||||
* `emsdk` needs to be present in your executable search path, *PATH* for
|
* `emsdk` needs to be present in your executable search path, *PATH* for
|
||||||
Bash-like enivironments
|
Bash-like environments
|
||||||
+ [Instructions located
|
+ [Instructions located
|
||||||
here](https://emscripten.org/docs/getting_started/downloads.html#sdk-download-and-install)
|
here](https://emscripten.org/docs/getting_started/downloads.html#sdk-download-and-install)
|
||||||
* Wrap cmake call: `emcmake cmake`
|
* Wrap cmake call: `emcmake cmake`
|
||||||
@ -309,7 +309,7 @@ class TProgram
|
|||||||
Reflection queries
|
Reflection queries
|
||||||
```
|
```
|
||||||
|
|
||||||
For just validating (not generating code), subsitute these calls:
|
For just validating (not generating code), substitute these calls:
|
||||||
|
|
||||||
```cxx
|
```cxx
|
||||||
setEnvInput(EShSourceHlsl or EShSourceGlsl, stage, EShClientNone, 0);
|
setEnvInput(EShSourceHlsl or EShSourceGlsl, stage, EShClientNone, 0);
|
||||||
@ -327,7 +327,7 @@ This interface is in roughly the first 2/3 of `ShaderLang.h`, and referred to
|
|||||||
as the `Sh*()` interface, as all the entry points start `Sh`.
|
as the `Sh*()` interface, as all the entry points start `Sh`.
|
||||||
|
|
||||||
The `Sh*()` interface takes a "compiler" call-back object, which it calls after
|
The `Sh*()` interface takes a "compiler" call-back object, which it calls after
|
||||||
building call back that is passed the AST and can then execute a backend on it.
|
building call back that is passed the AST and can then execute a back end on it.
|
||||||
|
|
||||||
The following is a simplified resulting run-time call stack:
|
The following is a simplified resulting run-time call stack:
|
||||||
|
|
||||||
@ -354,7 +354,7 @@ Basic Internal Operation
|
|||||||
* The intermediate representation is very high-level, and represented
|
* The intermediate representation is very high-level, and represented
|
||||||
as an in-memory tree. This serves to lose no information from the
|
as an in-memory tree. This serves to lose no information from the
|
||||||
original program, and to have efficient transfer of the result from
|
original program, and to have efficient transfer of the result from
|
||||||
parsing to the back-end. In the AST, constants are propogated and
|
parsing to the back-end. In the AST, constants are propagated and
|
||||||
folded, and a very small amount of dead code is eliminated.
|
folded, and a very small amount of dead code is eliminated.
|
||||||
|
|
||||||
To aid linking and reflection, the last top-level branch in the AST
|
To aid linking and reflection, the last top-level branch in the AST
|
||||||
|
Loading…
x
Reference in New Issue
Block a user