diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-04-14 20:14:51 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-04-14 20:14:51 +0000 |
| commit | 921a995810a60528a71bbea1d4299155742af9d4 (patch) | |
| tree | cf87cef18084f17d81f3c68e51b0050e17eba741 /Tests/TestApp/assets/TestRenderScripts.lua | |
| parent | Merged master (diff) | |
| download | DiligentEngine-921a995810a60528a71bbea1d4299155742af9d4.tar.gz DiligentEngine-921a995810a60528a71bbea1d4299155742af9d4.zip | |
Moved primitive topology to pipeline state
Diffstat (limited to 'Tests/TestApp/assets/TestRenderScripts.lua')
| -rw-r--r-- | Tests/TestApp/assets/TestRenderScripts.lua | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Tests/TestApp/assets/TestRenderScripts.lua b/Tests/TestApp/assets/TestRenderScripts.lua index 62f5d5c..15499e1 100644 --- a/Tests/TestApp/assets/TestRenderScripts.lua +++ b/Tests/TestApp/assets/TestRenderScripts.lua @@ -81,7 +81,7 @@ PSO = PipelineState.Create { InputIndex = 0, BufferSlot = 0, NumComponents = 3, ValueType = "VT_FLOAT32", IsNormalized = false}, { InputIndex = 1, BufferSlot = 1, NumComponents = 4, ValueType = "VT_UINT8", IsNormalized = true}, }, - PrimitiveTopologyType = "PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE", + PrimitiveTopology = "PRIMITIVE_TOPOLOGY_TRIANGLE_LIST", pVS = MinimalVS, pPS = UniformBufferPS, RTVFormats = "TEX_FORMAT_RGBA8_UNORM_SRGB", @@ -119,7 +119,7 @@ PSOInst = PipelineState.Create { InputIndex = 1, BufferSlot = 1, NumComponents = 4, ValueType = "VT_UINT8", IsNormalized = true}, { InputIndex = 2, BufferSlot = 2, NumComponents = 2, ValueType = "VT_FLOAT32", IsNormalized = false, Frequency = "FREQUENCY_PER_INSTANCE"}, }, - PrimitiveTopologyType = "PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE", + PrimitiveTopology = "PRIMITIVE_TOPOLOGY_TRIANGLE_LIST", pVS = MinimalInstVS, pPS = UniformBufferPS, RTVFormats = "TEX_FORMAT_RGBA8_UNORM_SRGB", @@ -179,16 +179,14 @@ UnfiformBuffer1 = Buffer.Create( ) DrawAttrs1 = DrawAttribs.Create{ - NumVertices = 3, - Topology = "PRIMITIVE_TOPOLOGY_TRIANGLE_LIST" + NumVertices = 3 } DrawAttrs2 = DrawAttribs.Create{ IsIndexed = true, NumIndices = 3, IndexType = "VT_UINT32", - NumInstances = 3, - Topology = "PRIMITIVE_TOPOLOGY_TRIANGLE_LIST" + NumInstances = 3 } ResMapping = ResourceMapping.Create{ |