diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-03-02 04:55:44 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-03-02 04:55:44 +0000 |
| commit | dd7847d9e2b0729799d3e953f7872719e6ab70c0 (patch) | |
| tree | 6aac246e73f61a29c6d5638d862cf698f5ae1a84 /Tests/TestApp/assets/TestRenderTargets.lua | |
| parent | Updated Core, FX & Samples submodules (diff) | |
| download | DiligentEngine-dd7847d9e2b0729799d3e953f7872719e6ab70c0.tar.gz DiligentEngine-dd7847d9e2b0729799d3e953f7872719e6ab70c0.zip | |
Updated test to compy with the new API
Diffstat (limited to 'Tests/TestApp/assets/TestRenderTargets.lua')
| -rw-r--r-- | Tests/TestApp/assets/TestRenderTargets.lua | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/Tests/TestApp/assets/TestRenderTargets.lua b/Tests/TestApp/assets/TestRenderTargets.lua index 10a645e..93399c4 100644 --- a/Tests/TestApp/assets/TestRenderTargets.lua +++ b/Tests/TestApp/assets/TestRenderTargets.lua @@ -290,39 +290,9 @@ BlendTexturesPS = Shader.Create{ UseCombinedTextureSamplers = true, Desc = { - ShaderType = "SHADER_TYPE_PIXEL", - StaticSamplers = - { - { - SamplerOrTextureName = "g_tex2DTest0", - Desc = - { - MinFilter = "FILTER_TYPE_LINEAR", - MagFilter = "FILTER_TYPE_LINEAR", - MipFilter = "FILTER_TYPE_POINT", - MaxLOD = 0 - } - }, - { - SamplerOrTextureName = "g_tex2DTest2", - Desc = - { - MinFilter = "FILTER_TYPE_LINEAR", - MagFilter = "FILTER_TYPE_LINEAR", - MipFilter = "FILTER_TYPE_POINT", - MaxLOD = 0 - } - } - } + ShaderType = "SHADER_TYPE_PIXEL" } } -assert(BlendTexturesPS.Desc.StaticSamplers[1].Desc.MipFilter == "FILTER_TYPE_POINT"); -assert(BlendTexturesPS.Desc.StaticSamplers[2].SamplerOrTextureName == "g_tex2DTest2"); - -QuadVS:BindResources(ResMapping) -RenderToTexturesPS:BindResources(ResMapping) -BlendTexturesPS:BindResources(ResMapping) - RenderToTexPSO = PipelineState.Create { @@ -347,11 +317,40 @@ RenderToTexPSO = PipelineState.Create PrimitiveTopology = "PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP" } } +RenderToTexPSO:BindStaticResources(ResMapping) RenderToTexSRB = RenderToTexPSO:CreateShaderResourceBinding(true) BlendTexPSO = PipelineState.Create { Name = "Blend textures PSO", + ResourceLayout = + { + StaticSamplers = + { + { + ShaderStages = "SHADER_TYPE_PIXEL", + SamplerOrTextureName = "g_tex2DTest0", + Desc = + { + MinFilter = "FILTER_TYPE_LINEAR", + MagFilter = "FILTER_TYPE_LINEAR", + MipFilter = "FILTER_TYPE_POINT", + MaxLOD = 0 + } + }, + { + ShaderStages = "SHADER_TYPE_PIXEL", + SamplerOrTextureName = "g_tex2DTest2", + Desc = + { + MinFilter = "FILTER_TYPE_LINEAR", + MagFilter = "FILTER_TYPE_LINEAR", + MipFilter = "FILTER_TYPE_POINT", + MaxLOD = 0 + } + } + } + }, GraphicsPipeline = { RasterizerDesc = @@ -372,6 +371,11 @@ BlendTexPSO = PipelineState.Create PrimitiveTopology = "PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP" } } +assert(BlendTexPSO.ResourceLayout.StaticSamplers[1].ShaderStages[1] == "SHADER_TYPE_PIXEL"); +assert(BlendTexPSO.ResourceLayout.StaticSamplers[1].Desc.MipFilter == "FILTER_TYPE_POINT"); +assert(BlendTexPSO.ResourceLayout.StaticSamplers[2].SamplerOrTextureName == "g_tex2DTest2"); + +BlendTexPSO:BindStaticResources(ResMapping) BlendTexSRB = BlendTexPSO:CreateShaderResourceBinding(true) DrawAttrs = DrawAttribs.Create{ |