diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-03 15:01:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-03 15:01:49 (GMT) |
| commit | b9eac05fb65198f1522ecec756f3fb4ae253e34b (patch) | |
| tree | d0e8e89dfec28f139994e87aa564260920d394e8 /Help | |
| parent | f773e28a8e6033ca128e1dd223fc2345a97efba5 (diff) | |
| parent | 2a224b4ce3fcc3c25bb3f56cf50806ae79262fc2 (diff) | |
| download | CMake-b9eac05fb65198f1522ecec756f3fb4ae253e34b.zip CMake-b9eac05fb65198f1522ecec756f3fb4ae253e34b.tar.gz CMake-b9eac05fb65198f1522ecec756f3fb4ae253e34b.tar.bz2 | |
Merge topic 'vs-hlsl-settings'
2a224b4c VS: Add source file properties to set the hlsl shader entry point and model
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 2 | ||||
| -rw-r--r-- | Help/prop_sf/VS_SHADER_ENTRYPOINT.rst | 5 | ||||
| -rw-r--r-- | Help/prop_sf/VS_SHADER_MODEL.rst | 5 | ||||
| -rw-r--r-- | Help/release/3.1.0.rst | 6 |
4 files changed, 16 insertions, 2 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index bf456f5..9ed53fa 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -291,6 +291,8 @@ Properties on Source Files /prop_sf/OBJECT_OUTPUTS /prop_sf/SYMBOLIC /prop_sf/VS_DEPLOYMENT_CONTENT + /prop_sf/VS_SHADER_ENTRYPOINT + /prop_sf/VS_SHADER_MODEL /prop_sf/VS_SHADER_TYPE /prop_sf/WRAP_EXCLUDE /prop_sf/XCODE_EXPLICIT_FILE_TYPE diff --git a/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst b/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst new file mode 100644 index 0000000..fe3471f --- /dev/null +++ b/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst @@ -0,0 +1,5 @@ +VS_SHADER_ENTRYPOINT +-------------------- + +Specifies the name of the entry point for the shader of a ``.hlsl`` source +file. diff --git a/Help/prop_sf/VS_SHADER_MODEL.rst b/Help/prop_sf/VS_SHADER_MODEL.rst new file mode 100644 index 0000000..b1cf0df --- /dev/null +++ b/Help/prop_sf/VS_SHADER_MODEL.rst @@ -0,0 +1,5 @@ +VS_SHADER_MODEL +--------------- + +Specifies the shader model of a ``.hlsl`` source file. Some shader types can +only be used with recent shader models diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.0.rst index e85bd4a..1ffc5b5 100644 --- a/Help/release/3.1.0.rst +++ b/Help/release/3.1.0.rst @@ -313,8 +313,10 @@ Other * The Visual Studio generators learned to treat ``.hlsl`` source files as High Level Shading Language sources (using ``FXCompile`` - in ``.vcxproj`` files). A :prop_sf:`VS_SHADER_TYPE` source file - property was added to specify the Shader Type. + in ``.vcxproj`` files). Source file properties + :prop_sf:`VS_SHADER_TYPE`, :prop_sf:`VS_SHADER_MODEL`, and + :prop_sf:`VS_SHADER_ENTRYPOINT` were added added to specify the + shader type, model, and entry point name. New Diagnostics =============== |