diff options
| author | Egor <egor.yusov@gmail.com> | 2018-02-18 06:25:41 +0000 |
|---|---|---|
| committer | Egor <egor.yusov@gmail.com> | 2018-02-18 06:25:41 +0000 |
| commit | 35665fe271cdbb2c641ef64eb36a02aacf98bb3d (patch) | |
| tree | f67181bfb242a698e957cd6a8d8c9bf23d1583c9 /Tests/TestApp/src | |
| parent | Moved common gradle build settings to android_common.gradle (diff) | |
| download | DiligentEngine-35665fe271cdbb2c641ef64eb36a02aacf98bb3d.tar.gz DiligentEngine-35665fe271cdbb2c641ef64eb36a02aacf98bb3d.zip | |
Few minor updates to lua test scripts
Diffstat (limited to 'Tests/TestApp/src')
| -rw-r--r-- | Tests/TestApp/src/MTResourceCreationTest.cpp | 18 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestPipelineStateBase.cpp | 20 |
2 files changed, 19 insertions, 19 deletions
diff --git a/Tests/TestApp/src/MTResourceCreationTest.cpp b/Tests/TestApp/src/MTResourceCreationTest.cpp index 22813cb..d1160b5 100644 --- a/Tests/TestApp/src/MTResourceCreationTest.cpp +++ b/Tests/TestApp/src/MTResourceCreationTest.cpp @@ -32,14 +32,14 @@ using namespace Diligent; static const char g_ShaderSource[] = "void VSMain(out float4 pos : SV_POSITION) \n" -"{ \n" -" pos = float4(0,0,0,0); \n" -"} \n" -" \n" +"{ \n" +" pos = float4(0.0, 0.0, 0.0, 0.0); \n" +"} \n" +" \n" "void PSMain(out float4 col : SV_TARGET)\n" -"{ \n" -" col = float4(0,0,0,0); \n" -"} \n" +"{ \n" +" col = float4(0.0, 0.0, 0.0, 0.0); \n" +"} \n" ; MTResourceCreationTest::MTResourceCreationTest(IRenderDevice *pDevice, IDeviceContext *pContext, Uint32 NumThreads) : @@ -189,13 +189,13 @@ void MTResourceCreationTest::ThreadWorkerFunc(bool bIsMasterThread) Attrs.Source = g_ShaderSource; Attrs.EntryPoint = "VSMain"; Attrs.Desc.ShaderType = SHADER_TYPE_VERTEX; - Attrs.Desc.Name = "TrivialVS"; + Attrs.Desc.Name = "TrivialVS (MTResourceCreationTest)"; Attrs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL; m_pDevice->CreateShader(Attrs, &pTrivialVS); Attrs.EntryPoint = "PSMain"; Attrs.Desc.ShaderType = SHADER_TYPE_PIXEL; - Attrs.Desc.Name = "TrivialPS"; + Attrs.Desc.Name = "TrivialPS (MTResourceCreationTest)"; m_pDevice->CreateShader(Attrs, &pTrivialPS); PipelineStateDesc PSODesc; diff --git a/Tests/TestApp/src/TestPipelineStateBase.cpp b/Tests/TestApp/src/TestPipelineStateBase.cpp index f5479eb..b4c5041 100644 --- a/Tests/TestApp/src/TestPipelineStateBase.cpp +++ b/Tests/TestApp/src/TestPipelineStateBase.cpp @@ -30,14 +30,14 @@ using namespace Diligent; static const char g_ShaderSource[] = "void VSMain(out float4 pos : SV_POSITION) \n" -"{ \n" -" pos = float4(0,0,0,0); \n" -"} \n" -" \n" -"void PSMain(out float4 col : SV_TARGET)\n" -"{ \n" -" col = float4(0,0,0,0); \n" -"} \n" +"{ \n" +" pos = float4(0.0, 0.0, 0.0, 0.0); \n" +"} \n" +" \n" +"void PSMain(out float4 col : SV_TARGET) \n" +"{ \n" +" col = float4(0.0, 0.0, 0.0, 0.0); \n" +"} \n" ; TestPipelineStateBase::TestPipelineStateBase(Diligent::IRenderDevice *pDevice, const char *Name) : @@ -48,13 +48,13 @@ TestPipelineStateBase::TestPipelineStateBase(Diligent::IRenderDevice *pDevice, c Attrs.Source = g_ShaderSource; Attrs.EntryPoint = "VSMain"; Attrs.Desc.ShaderType = SHADER_TYPE_VERTEX; - Attrs.Desc.Name = "TrivialVS"; + Attrs.Desc.Name = "TrivialVS (TestPipelineStateBase)"; Attrs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL; m_pDevice->CreateShader(Attrs, &m_pTrivialVS); Attrs.EntryPoint = "PSMain"; Attrs.Desc.ShaderType = SHADER_TYPE_PIXEL; - Attrs.Desc.Name = "TrivialPS"; + Attrs.Desc.Name = "TrivialPS (TestPipelineStateBase)"; m_pDevice->CreateShader(Attrs, &m_pTrivialPS); m_PSODesc.GraphicsPipeline.pVS = m_pTrivialVS; |