summaryrefslogtreecommitdiffstats
path: root/Tests/VSWinStorePhone/Direct3DApp1
diff options
context:
space:
mode:
authorCedric Perthuis <cedric.perthuis@gmail.com>2014-12-02 09:41:10 (GMT)
committerBrad King <brad.king@kitware.com>2014-12-03 14:30:59 (GMT)
commit2a224b4ce3fcc3c25bb3f56cf50806ae79262fc2 (patch)
treeb5ad40461fb63e893ead590dc96d67027a6b1025 /Tests/VSWinStorePhone/Direct3DApp1
parent433c6d4689ca86f1a8d8d966be0204e98f95b968 (diff)
downloadCMake-2a224b4ce3fcc3c25bb3f56cf50806ae79262fc2.zip
CMake-2a224b4ce3fcc3c25bb3f56cf50806ae79262fc2.tar.gz
CMake-2a224b4ce3fcc3c25bb3f56cf50806ae79262fc2.tar.bz2
VS: Add source file properties to set the hlsl shader entry point and model
Create properties VS_SHADER_ENTRYPOINT and VS_SHADER_MODEL. Without these many .hlsl source files may not be possible to use. Extend the VSWinStorePhone test project to cover them.
Diffstat (limited to 'Tests/VSWinStorePhone/Direct3DApp1')
-rw-r--r--Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl2
-rw-r--r--Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl2
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl b/Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl
index d61e2c8..6796da1 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl
+++ b/Tests/VSWinStorePhone/Direct3DApp1/SimplePixelShader.hlsl
@@ -4,7 +4,7 @@ struct PixelShaderInput
float3 color : COLOR0;
};
-float4 main(PixelShaderInput input) : SV_TARGET
+float4 mainPS(PixelShaderInput input) : SV_TARGET
{
return float4(input.color,1.0f);
}
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl b/Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl
index 65d60e5..0963060 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl
+++ b/Tests/VSWinStorePhone/Direct3DApp1/SimpleVertexShader.hlsl
@@ -17,7 +17,7 @@ struct VertexShaderOutput
float3 color : COLOR0;
};
-VertexShaderOutput main(VertexShaderInput input)
+VertexShaderOutput mainVS(VertexShaderInput input)
{
VertexShaderOutput output;
float4 pos = float4(input.pos, 1.0f);