Removed RenderScript & Lua; updated submodules

5 files changed, 10 insertions, 513 deletions

diff --git a/Tests/TestApp/src/RenderScriptTest.cpp b/Tests/TestApp/src/RenderScriptTest.cpp
deleted file mode 100644
index ff8d1d4..0000000
--- a/Tests/TestApp/src/RenderScriptTest.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/*     Copyright 2019 Diligent Graphics LLC
- *  
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- *  In no event and under no legal theory, whether in tort (including negligence), 
- *  contract, or otherwise, unless required by applicable law (such as deliberate 
- *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
- *  liable for any damages, including any direct, indirect, special, incidental, 
- *  or consequential damages of any character arising as a result of this License or 
- *  out of the use or inability to use the software (including but not limited to damages 
- *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and 
- *  all other commercial damages or losses), even if such Contributor has been advised 
- *  of the possibility of such damages.
- */
-
-#include "pch.h"
-#include "RenderScriptTest.h"
-#include "FileSystem.h"
-#include "Errors.h"
-#include "ScriptParser.h"
-#include "ConvenienceFunctions.h"
-
-using namespace Diligent;
-
-RenderScriptTest::RenderScriptTest( IRenderDevice *pRenderDevice, IDeviceContext *pContext ) :
-    UnitTestBase("RenderScript test")
-{
-#if PLATFORM_IOS
-    SetStatus(TestResult::Skipped);
-    return;
-#endif
-    
-    RefCntAutoPtr<ITexture> pTestGlobalTexture;
-    {
-        TextureDesc TexDesc;
-        TexDesc.Type = RESOURCE_DIM_TEX_2D;
-        TexDesc.Name = "Test Global Texture 2D";
-        TexDesc.Width = 1024;
-        TexDesc.Height = 512;
-        TexDesc.MipLevels = 1;
-        TexDesc.Format = TEX_FORMAT_RGBA8_UNORM;
-        TexDesc.Usage = USAGE_DYNAMIC;
-        TexDesc.BindFlags = BIND_SHADER_RESOURCE;
-        TexDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
-        pRenderDevice->CreateTexture( TexDesc, nullptr, &pTestGlobalTexture );
-    }
-
-    auto pScript = CreateRenderScriptFromFile( "LuaTest.lua", pRenderDevice, pContext, [&]( Diligent::ScriptParser *pScriptParser )
-    {
-        pScriptParser->SetGlobalVariable( "TestGlobalBool", True );
-        pScriptParser->SetGlobalVariable( "TestGlobalInt", (Int32)19 );
-        pScriptParser->SetGlobalVariable( "TestGlobalFloat", (Float32)139.25 );
-        pScriptParser->SetGlobalVariable( "TestGlobalString", "Test Global String" );
-        
-        {
-            Diligent::BufferDesc BuffDesc;
-            BuffDesc.Name = "TestGlobalBuff";
-            BuffDesc.uiSizeInBytes = 256;
-            BuffDesc.BindFlags = BIND_UNIFORM_BUFFER;
-            BuffDesc.Usage = USAGE_DYNAMIC;
-            BuffDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
-            RefCntAutoPtr<IBuffer> pBuffer;
-            pRenderDevice->CreateBuffer( BuffDesc, nullptr, &pBuffer );
-            pScriptParser->SetGlobalVariable( "TestGlobalBuffer", pBuffer );
-        }
-
-        {
-            Diligent::BufferDesc BuffDesc;
-            BuffDesc.Name = "TestGlobalBuff2";
-            BuffDesc.uiSizeInBytes = 64;
-            BuffDesc.BindFlags = BIND_SHADER_RESOURCE | BIND_UNORDERED_ACCESS;
-            BuffDesc.Usage = USAGE_DEFAULT;
-            BuffDesc.ElementByteStride = 16;
-            BuffDesc.Mode = BUFFER_MODE_STRUCTURED;
-            RefCntAutoPtr<IBuffer> pBuffer;
-            pRenderDevice->CreateBuffer( BuffDesc, nullptr, &pBuffer );
-            pScriptParser->SetGlobalVariable( "TestGlobalBufferWithUAV", pBuffer );
-
-            auto *pUAV = pBuffer->GetDefaultView( BUFFER_VIEW_UNORDERED_ACCESS );
-            pScriptParser->SetGlobalVariable( "TestGlobalBuffer2UAV", pUAV );
-        }
-
-        {
-            SamplerDesc SamplerDesc;
-            SamplerDesc.Name = "Test Sampler";
-            SamplerDesc.MinFilter = FILTER_TYPE_COMPARISON_POINT;
-            SamplerDesc.MagFilter = FILTER_TYPE_COMPARISON_LINEAR;
-            SamplerDesc.MipFilter = FILTER_TYPE_COMPARISON_LINEAR;
-            SamplerDesc.AddressU = TEXTURE_ADDRESS_WRAP;
-            SamplerDesc.AddressV = TEXTURE_ADDRESS_MIRROR;
-            SamplerDesc.AddressW = TEXTURE_ADDRESS_CLAMP;
-            SamplerDesc.MipLODBias = 4;
-            SamplerDesc.MinLOD = 1.5f;
-            SamplerDesc.MaxLOD = 4;
-            SamplerDesc.MaxAnisotropy = 2;
-            SamplerDesc.ComparisonFunc = COMPARISON_FUNC_LESS;
-            SamplerDesc.BorderColor[0] = 0.f;
-            SamplerDesc.BorderColor[1] = 0.f;
-            SamplerDesc.BorderColor[2] = 0.f;
-            SamplerDesc.BorderColor[3] = 1.f;
-            RefCntAutoPtr<ISampler> pSampler;
-            pRenderDevice->CreateSampler( SamplerDesc, &pSampler );
-            pScriptParser->SetGlobalVariable( "TestGlobalSampler", pSampler );
-        }
-
-        {
-            pScriptParser->SetGlobalVariable( "TestGlobalTexture", pTestGlobalTexture );
-        }
-
-        {
-            ScriptParser::CombinedDrawAttribs GlobalDrawAttribs;
-            GlobalDrawAttribs.NumVertices = 123;
-            GlobalDrawAttribs.IndexType = VT_UINT16;
-            GlobalDrawAttribs.NumInstances = 19;
-            GlobalDrawAttribs.BaseVertex = 97;
-            GlobalDrawAttribs.IndirectDrawArgsOffset = 120;
-            GlobalDrawAttribs.StartVertexLocation = 98;
-            pScriptParser->SetGlobalVariable( "TestGlobalDrawAttribs", GlobalDrawAttribs );
-        }
-
-        auto DevType = pRenderDevice->GetDeviceCaps().DevType;
-        if( DevType == DeviceType::D3D11 || DevType == DeviceType::D3D12 )
-        {
-            TextureViewDesc TestTexViewDesc;
-            TestTexViewDesc.Name = "TestTextureSRV2";
-            TestTexViewDesc.ViewType = TEXTURE_VIEW_SHADER_RESOURCE;
-            TestTexViewDesc.TextureDim = RESOURCE_DIM_TEX_2D;
-            TestTexViewDesc.Format = TEX_FORMAT_RGBA8_UNORM;
-            RefCntAutoPtr<ITextureView> pTestTextureView;
-            pTestGlobalTexture->CreateView( TestTexViewDesc, &pTestTextureView );
-            pScriptParser->SetGlobalVariable( "TestGlobalTextureView", pTestTextureView );
-        }
-
-        {
-            ResourceMappingEntry Entries[] = { 
-                    { "TestGlobalTextureSRV", pTestGlobalTexture->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE)},
-                    ResourceMappingEntry() 
-            };
-            ResourceMappingDesc ResMappingDesc;
-            ResMappingDesc.pEntries= Entries;
-            RefCntAutoPtr<IResourceMapping> pResMapping;
-            pRenderDevice->CreateResourceMapping( ResMappingDesc, &pResMapping );
-            pScriptParser->SetGlobalVariable( "TestGlobalResourceMapping", pResMapping );
-        }
-    } );
-
-    {
-        RefCntAutoPtr<ISampler> pTestSampler;
-        pScript->GetSamplerByName( "TestSampler", &pTestSampler );
-        const auto &SamplerDesc = pTestSampler->GetDesc();
-        assert( strcmp(SamplerDesc.Name, "Test Sampler") == 0 );
-        assert( SamplerDesc.MinFilter == FILTER_TYPE_POINT );
-        assert( SamplerDesc.MagFilter == FILTER_TYPE_LINEAR );
-        assert( SamplerDesc.MipFilter == FILTER_TYPE_POINT );
-        assert( SamplerDesc.AddressU == TEXTURE_ADDRESS_WRAP );
-        assert( SamplerDesc.AddressV == TEXTURE_ADDRESS_MIRROR );
-        assert( SamplerDesc.AddressW == TEXTURE_ADDRESS_CLAMP );
-        assert( SamplerDesc.MipLODBias == 2 );
-        assert( SamplerDesc.MinLOD == 0.5f );
-        assert( SamplerDesc.MaxLOD == 10 );
-        assert( SamplerDesc.MaxAnisotropy == 6 );
-        assert( SamplerDesc.ComparisonFunc == COMPARISON_FUNC_GREATER_EQUAL );
-        assert( SamplerDesc.BorderColor[0] == 0.f );
-        assert( SamplerDesc.BorderColor[1] == 0.f );
-        assert( SamplerDesc.BorderColor[2] == 0.f );
-        assert( SamplerDesc.BorderColor[3] == 1.f );
-        (void)SamplerDesc;
-    }
-
-    {
-        RefCntAutoPtr<ISampler> pTestSampler3;
-        pScript->GetSamplerByName( "TestSampler3", &pTestSampler3 );
-        const auto &SamplerDesc = pTestSampler3->GetDesc();
-        assert( SamplerDesc.BorderColor[0] == 0.f);
-        assert( SamplerDesc.BorderColor[1] == 0.f );
-        assert( SamplerDesc.BorderColor[2] == 0.f );
-        assert( SamplerDesc.BorderColor[3] == 1.f );
-        (void)SamplerDesc;
-    }
-
-    {
-        RefCntAutoPtr<ISampler> pTestSampler2;
-        pScript->GetSamplerByName( "TestSampler2", &pTestSampler2 );
-        const auto &SamplerDesc = pTestSampler2->GetDesc();
-        assert( strcmp(SamplerDesc.Name, "Test Sampler") == 0);
-        assert( SamplerDesc.MinFilter == FILTER_TYPE_POINT );
-        assert( SamplerDesc.MagFilter == FILTER_TYPE_LINEAR );
-        assert( SamplerDesc.MipFilter == FILTER_TYPE_POINT );
-        assert( SamplerDesc.AddressU == TEXTURE_ADDRESS_WRAP );
-        assert( SamplerDesc.AddressV == TEXTURE_ADDRESS_MIRROR );
-        assert( SamplerDesc.AddressW == TEXTURE_ADDRESS_CLAMP );
-        assert( SamplerDesc.MipLODBias == 2 );
-        assert( SamplerDesc.MinLOD == 0.5f );
-        assert( SamplerDesc.MaxLOD == 10 );
-        assert( SamplerDesc.MaxAnisotropy == 6 );
-        assert( SamplerDesc.ComparisonFunc == COMPARISON_FUNC_GREATER_EQUAL );
-        assert( SamplerDesc.BorderColor[0] == 0.f );
-        assert( SamplerDesc.BorderColor[1] == 0.f );
-        assert( SamplerDesc.BorderColor[2] == 0.f );
-        assert( SamplerDesc.BorderColor[3] == 1.f );
-        (void)SamplerDesc;
-    }
-
-
-    {
-        RefCntAutoPtr<ISampler> pTestSampler4;
-        pScript->GetSamplerByName( "TestSampler4", &pTestSampler4 );
-        const auto &SamDesc = pTestSampler4->GetDesc();
-        assert( SamDesc.MinFilter == SamplerDesc().MinFilter );
-        assert( SamDesc.MagFilter == SamplerDesc().MagFilter );
-        assert( SamDesc.MipFilter == SamplerDesc().MipFilter );
-        assert( SamDesc.AddressU == SamplerDesc().AddressU );
-        assert( SamDesc.AddressV == SamplerDesc().AddressV );
-        assert( SamDesc.AddressW == SamplerDesc().AddressW );
-        assert( SamDesc.MipLODBias == SamplerDesc().MipLODBias );
-        assert( SamDesc.MinLOD == SamplerDesc().MinLOD );
-        assert( SamDesc.MaxLOD == SamplerDesc().MaxLOD );
-        assert( SamDesc.MaxAnisotropy == SamplerDesc().MaxAnisotropy );
-        assert( SamDesc.ComparisonFunc == SamplerDesc().ComparisonFunc );
-        assert( SamDesc.BorderColor[0] == SamplerDesc().BorderColor[0] );
-        assert( SamDesc.BorderColor[1] == SamplerDesc().BorderColor[1] );
-        assert( SamDesc.BorderColor[2] == SamplerDesc().BorderColor[2] );
-        assert( SamDesc.BorderColor[3] == SamplerDesc().BorderColor[3] );
-        (void)SamDesc;
-    }
-    
-    for( int iVertLayout = 0; iVertLayout < 3; ++iVertLayout )
-    {
-        std::stringstream ss1;
-        ss1 << "TestVertexLayoutPSO";
-        if( iVertLayout > 0 )
-        {
-            ss1 << (iVertLayout + 1);
-        }
-        String VariableName = ss1.str();
-
-        RefCntAutoPtr<IPipelineState> pTestPSO;
-        pScript->GetPipelineStateByName( VariableName.c_str(), &pTestPSO );
-        const auto &Desc = pTestPSO->GetDesc().GraphicsPipeline.InputLayout;
-        assert( Desc.NumElements == 3 );
-        assert( Desc.LayoutElements[0].InputIndex == 0 );
-        assert( Desc.LayoutElements[0].BufferSlot == 0 );
-        assert( Desc.LayoutElements[0].NumComponents == 3 );
-        assert( Desc.LayoutElements[0].ValueType == VT_FLOAT32 );
-        assert( Desc.LayoutElements[0].IsNormalized == false );
-
-        assert( Desc.LayoutElements[1].InputIndex == 1 );
-        assert( Desc.LayoutElements[1].BufferSlot == 1 );
-        assert( Desc.LayoutElements[1].NumComponents == 4 );
-        assert( Desc.LayoutElements[1].ValueType == VT_UINT8 );
-        assert( Desc.LayoutElements[1].IsNormalized == true );
-
-        assert( Desc.LayoutElements[2].InputIndex == 2 );
-        assert( Desc.LayoutElements[2].BufferSlot == 2 );
-        assert( Desc.LayoutElements[2].NumComponents == 2 );
-        assert( Desc.LayoutElements[2].ValueType == VT_FLOAT32 );
-        assert( Desc.LayoutElements[2].IsNormalized == false );
-        assert( Desc.LayoutElements[2].Frequency == LayoutElement::FREQUENCY_PER_INSTANCE );
-        assert( Desc.LayoutElements[2].InstanceDataStepRate == 1 );
-        (void)Desc;
-    }
-
-    {
-        RefCntAutoPtr<IShader> pTestVS;
-        pScript->GetShaderByName( "TestVS", &pTestVS );
-        const auto &Desc = pTestVS->GetDesc();
-        assert( strcmp(Desc.Name, "TestVS") == 0 );
-        assert( Desc.ShaderType == SHADER_TYPE_VERTEX );
-        (void)Desc;
-    }
-
-    {
-        RefCntAutoPtr<IShader> pTestPS;
-        pScript->GetShaderByName( "TestPS", &pTestPS );
-        const auto &Desc = pTestPS->GetDesc();
-        assert( strcmp(Desc.Name, "TestPS") == 0 );
-        assert( Desc.ShaderType == SHADER_TYPE_PIXEL );
-        (void)Desc;
-    }
-
-    {
-        RefCntAutoPtr<IShader> pTestPS2;
-        pScript->GetShaderByName( "TestPS2", &pTestPS2 );
-        const auto &Desc = pTestPS2->GetDesc();
-        assert( strcmp(Desc.Name, "TestPS2") == 0 );
-        assert( Desc.ShaderType == SHADER_TYPE_PIXEL );
-        (void)Desc;
-    }
-
-    Int32 MagicNumber1 = 123;
-    float MagicNumber2 = 345.5f;
-    String MagicString = "Magic String";
-    pScript->Run( "TestRenderScriptParams", True, MagicNumber1, MagicNumber2, False, MagicString );
-
-    {
-        RefCntAutoPtr<ISampler> pTestSampler;
-        pScript->GetSamplerByName( "TestSampler", &pTestSampler );
-        pScript->Run( "TestSamplerArg", pTestSampler );
-    }
-
-    {
-        RefCntAutoPtr<IPipelineState> pTestPSO;
-        pScript->GetPipelineStateByName( "TestVertexLayoutPSO", &pTestPSO );
-        pScript->Run( "TestVertexDescInPSO", pTestPSO );
-    }
-
-    {
-        RefCntAutoPtr<IShader> pTestVS;
-        pScript->GetShaderByName( "TestVS", &pTestVS );
-        pScript->Run( "TestShaderArg", pTestVS );
-    }
-
-    {
-        RefCntAutoPtr<IBuffer> pTestBuffer;
-        pScript->GetBufferByName( "TestBuffer", &pTestBuffer );
-        const auto &Desc = pTestBuffer->GetDesc();
-        assert( strcmp(Desc.Name, "Test Buffer") == 0 );
-        assert( Desc.Usage == USAGE_DEFAULT );
-        assert( Desc.BindFlags == (BIND_VERTEX_BUFFER | BIND_SHADER_RESOURCE) );
-        (void)Desc;
-
-        pScript->Run( "TestBufferArg", pTestBuffer );
-    }
-
-    {
-        pScript->Run( "TestTextureArg", pTestGlobalTexture );
-    }
-
-    {
-        ScriptParser::CombinedDrawAttribs Attribs;
-        Attribs.NumVertices = 34;
-        Attribs.IndexType = VT_UINT16;
-        Attribs.NumInstances = 139;
-        Attribs.BaseVertex = 937;
-        Attribs.IndirectDrawArgsOffset = 1205;
-        Attribs.StartVertexLocation = 198;
-        pScript->Run( "TestDrawAttribsArg", Attribs );
-    }
-
-    {
-        RefCntAutoPtr<ITextureView> pDefaultTestTextureSRV;
-        pScript->GetTextureViewByName( "DefaultTestSRV", &pDefaultTestTextureSRV );
-        assert( pDefaultTestTextureSRV  );
-        RefCntAutoPtr<ITexture> pTestTestTexture;
-        pScript->GetTextureByName( "TestTexture", &pTestTestTexture );
-        assert(pTestTestTexture );
-        assert( pDefaultTestTextureSRV == pTestTestTexture->GetDefaultView( TEXTURE_VIEW_SHADER_RESOURCE ) );
-    }
-
-    auto DevType = pRenderDevice->GetDeviceCaps().DevType;
-    if( DevType == DeviceType::D3D11 || DevType == DeviceType::D3D12 )
-    {
-        {
-            RefCntAutoPtr<ITextureView> pTestTestTextureView;
-            pScript->GetTextureViewByName( "TestTextureView", &pTestTestTextureView );
-            const auto &Desc = pTestTestTextureView->GetDesc();
-            assert( strcmp(Desc.Name, "TestTextureSRV") == 0 );
-            assert( Desc.ViewType == TEXTURE_VIEW_SHADER_RESOURCE );
-            assert( Desc.TextureDim == RESOURCE_DIM_TEX_2D_ARRAY );
-            assert( Desc.Format == TEX_FORMAT_RGBA8_UNORM );
-            assert( Desc.MostDetailedMip == 1 );
-            assert( Desc.NumMipLevels == 2 );
-            assert( Desc.FirstArraySlice == 3 );
-            assert( Desc.NumArraySlices == 4 );
-            (void)Desc;
-            
-            pScript->Run( "TestTextureViewArg", pTestTestTextureView );
-        }
-    }
-
-    {
-        RefCntAutoPtr<IResourceMapping> pResMapping;
-        pScript->GetResourceMappingByName( "TestResourceMapping", &pResMapping );
-        RefCntAutoPtr<IDeviceObject> pSRV, pBuff;
-        pResMapping->GetResource( "TestShaderName", &pSRV );
-        assert( pSRV != nullptr );
-        pResMapping->GetResource( "TestBufferName", &pBuff );
-        assert( pBuff != nullptr );
-    }
-
-    {
-        {
-            ResourceMappingEntry Entries[] = {
-                    { "TestGlobalTextureSRV2", pTestGlobalTexture->GetDefaultView( TEXTURE_VIEW_SHADER_RESOURCE ) },
-                    ResourceMappingEntry()
-            };
-            ResourceMappingDesc ResMappingDesc;
-            ResMappingDesc.pEntries = Entries;
-            RefCntAutoPtr<IResourceMapping> pResMapping;
-            pRenderDevice->CreateResourceMapping( ResMappingDesc, &pResMapping );
-            pScript->Run( "TestResourceMappingArg", pResMapping );
-            RefCntAutoPtr<IDeviceObject> pRes;
-            pResMapping->GetResource( "TestBufferName", &pRes );
-            assert( pRes != nullptr );
-        }
-    }
-
-    {
-        RefCntAutoPtr<IBuffer> pBuffer;
-        pScript->GetBufferByName( "TestGlobalBufferWithUAV", &pBuffer );
-        RefCntAutoPtr<IBufferView> pBuffUAV;
-        BufferViewDesc BuffViewDesc;
-        BuffViewDesc.Name = "TestGlobalBuff2UAV";
-        BuffViewDesc.ViewType = BUFFER_VIEW_UNORDERED_ACCESS;
-        BuffViewDesc.ByteOffset = 0;
-        BuffViewDesc.ByteWidth = 32;
-        pBuffer->CreateView(BuffViewDesc, &pBuffUAV);
-
-        pScript->Run( "TestBufferViewArg", pBuffUAV );
-    }
-
-    //{
-    //    RefCntAutoPtr<IShaderResourceVariable> pShaderVar;
-    //    pScript->GetShaderVariableByName( "svTestBlock", &pShaderVar );
-    //    assert( pShaderVar );
-
-    //    pScript->SetGlobalVariable( "svTestBlock", pShaderVar );
-    //    pScript->Run( "TestShaderVariable", pShaderVar );
-    //}
-    SetStatus(TestResult::Succeeded);
-}
diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp
index b588590..36d42e4 100644
--- a/Tests/TestApp/src/TestApp.cpp
+++ b/Tests/TestApp/src/TestApp.cpp
@@ -54,10 +54,7 @@
 
 #include "FileSystem.h"
 #include "MapHelper.h"
-#include "RenderScriptTest.h"
-#include "ScriptParser.h"
 #include "Errors.h"
-#include "ConvenienceFunctions.h"
 #include "TestVPAndSR.h"
 #include "TestCopyTexData.h"
 #include "PlatformMisc.h"
@@ -297,15 +294,8 @@ void TestApp::InitializeRenderers()
     m_TestGS.Init(m_pDevice, m_pImmediateContext, m_pSwapChain);
     m_TestTessellation.Init(m_pDevice, m_pImmediateContext, m_pSwapChain);
         
-    RenderScriptTest LuaTest{m_pDevice, m_pImmediateContext};
-    
     const auto* BackBufferFmt = m_pDevice->GetTextureFormatInfo(m_pSwapChain->GetDesc().ColorBufferFormat).Name;
     const auto* DepthBufferFmt = m_pDevice->GetTextureFormatInfo(m_pSwapChain->GetDesc().DepthBufferFormat).Name;
-    m_pRenderScript = CreateRenderScriptFromFile("TestRenderScripts.lua", m_pDevice, m_pImmediateContext, [BackBufferFmt, DepthBufferFmt](ScriptParser *pScriptParser)
-    {
-        pScriptParser->SetGlobalVariable( "extBackBufferFormat", BackBufferFmt );
-        pScriptParser->SetGlobalVariable( "extDepthBufferFormat", DepthBufferFmt );
-    });
 
     m_pTestDrawCommands.reset(new TestDrawCommands);
     m_pTestDrawCommands->Init(m_pDevice, m_pImmediateContext, m_pSwapChain, 0, 0, 1, 1);
@@ -343,26 +333,6 @@ void TestApp::InitializeRenderers()
     float instance_offsets[] = { -0.3f, 0.0f, 0.0f, 0.0f, +0.3f, -0.3f };
     
     {
-        m_pRenderScript->GetBufferByName("InstanceBuffer", &m_pInstBuff);
-    }
-
-    {
-        auto BuffDesc = m_pInstBuff->GetDesc();
-        BuffDesc.uiSizeInBytes = sizeof(instance_offsets);
-        //BuffDesc.BindFlags = BIND_VERTEX_BUFFER;
-        BuffDesc.Usage = USAGE_DEFAULT;
-        //Diligent::BufferData BuffData;
-        //BuffData.pData = instance_offsets;
-        //BuffData.DataSize = sizeof(instance_offsets);
-        m_pDevice->CreateBuffer(BuffDesc, nullptr, &m_pInstBuff2);
-    }
-    
-
-    {
-        m_pRenderScript->GetBufferByName("UnfiformBuffer1", &m_pUniformBuff);
-    }
-
-    {
         Diligent::BufferDesc BuffDesc;
         BuffDesc.Name = "cbTestBlock2";
         float UniformData[16] = { 1,1,1,1 };
@@ -402,15 +372,6 @@ void TestApp::InitializeRenderers()
     }
 
     {
-        RefCntAutoPtr<IResourceMapping> pResMapping;
-        m_pRenderScript->GetResourceMappingByName("ResMapping", &pResMapping);
-        pResMapping->AddResource("cbTestBlock3", m_pUniformBuff3, true);
-        m_pRenderScript->Run("AddConstBufferToMapping", "cbTestBlock4", m_pUniformBuff4);
-        m_pRenderScript->Run("AddConstBufferToMapping", "cbTestBlock2", m_pUniformBuff2);
-        m_pRenderScript->Run("BindShaderResources");
-    }
-
-    {
         TextureDesc TexDesc;
         TexDesc.Type = RESOURCE_DIM_TEX_2D;
         TexDesc.Width = 1024;
@@ -448,11 +409,6 @@ void TestApp::InitializeRenderers()
         auto* pDSV = pDepthTex->GetDefaultView(TEXTURE_VIEW_DEPTH_STENCIL);
 
         {
-            MapHelper<float> UniformData(m_pImmediateContext, m_pUniformBuff, MAP_WRITE, MAP_FLAG_DISCARD);
-            UniformData[0] = UniformData[1] = UniformData[2] = UniformData[3] = 0;
-        }
-
-        {
             MapHelper<float> UniformData(m_pImmediateContext, m_pUniformBuff2, MAP_WRITE, MAP_FLAG_DISCARD);
             UniformData[0] = (float)sin(0)*0.1f;
             UniformData[1] = (float)cos(0)*0.1f;
@@ -463,17 +419,12 @@ void TestApp::InitializeRenderers()
         m_pImmediateContext->SetRenderTargets(0, nullptr, nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
         float ClearColor[] = {0.1f, 0.2f, 0.4f, 1.0f};
         m_pImmediateContext->ClearRenderTarget(nullptr, ClearColor, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
-        DrawAttribs DrawAttrs;
-        DrawAttrs.NumVertices = 3;
-        DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
-        m_pRenderScript->Run(m_pImmediateContext, "DrawTris", DrawAttrs);
         
         // This adds transition barrier for pTex1
         m_pImmediateContext->SetRenderTargets(1, pRTVs, pDSV, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
         m_pImmediateContext->ClearRenderTarget(pRTVs[0], ClearColor, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
         m_pImmediateContext->ClearDepthStencil(pDSV, CLEAR_DEPTH_FLAG, 1, 0, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
         // Generate draw command to the bound render target
-        m_pImmediateContext->Draw(DrawAttrs);
         m_pImmediateContext->SetRenderTargets(0, nullptr, nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
         // This will destroy texture and put D3D12 resource into release queue
         pTex.Release();
@@ -581,36 +532,7 @@ void TestApp::Render()
     
     double dCurrTime = m_CurrTime;
     
-    float instance_offsets[] = { -0.3f, (float)sin(dCurrTime + 0.5)*0.1f, 0.0f, (float)sin(dCurrTime)*0.1f, +0.3f, -0.3f + (float)cos(dCurrTime)*0.1f };
-    m_pImmediateContext->UpdateBuffer(m_pInstBuff2, sizeof(float) * 1, sizeof(float) * 5, &instance_offsets[1], RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
-    m_pImmediateContext->CopyBuffer(m_pInstBuff2, sizeof(float) * 2, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, m_pInstBuff, sizeof(float) * 2, sizeof(float) * 4, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
     
-    {
-        MapHelper<float> UniformData(m_pImmediateContext, m_pUniformBuff, MAP_WRITE, MAP_FLAG_DISCARD);
-        UniformData[0] = UniformData[1] = UniformData[2] = UniformData[3] = (float)fabs(sin(dCurrTime));
-    }
-    
-    {
-        MapHelper<float> UniformData(m_pImmediateContext, m_pUniformBuff2, MAP_WRITE, MAP_FLAG_DISCARD);
-        UniformData[0] = (float)sin(dCurrTime*3.8)*0.1f;
-        UniformData[1] = (float)cos(dCurrTime*3.2)*0.1f;
-        UniformData[2] = (float)sin(dCurrTime*3.9)*0.1f;
-        UniformData[3] = 0;
-    }
-
-    {
-        DrawAttribs DrawAttrs{3, DRAW_FLAG_VERIFY_ALL};
-        m_pRenderScript->Run(m_pImmediateContext, "DrawTris", DrawAttrs);
-    }
-
-    {
-        DrawIndexedAttribs DrawAttrs{};
-        DrawAttrs.NumIndices = 3;
-        DrawAttrs.IndexType = VT_UINT32;
-        DrawAttrs.NumInstances = 3;
-        DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
-        m_pRenderScript->Run(m_pImmediateContext, "DrawTris", DrawAttrs);
-    }
     m_pTestDrawCommands->Draw();
     m_pTestBufferAccess->Draw((float)dCurrTime);
 
diff --git a/Tests/TestApp/src/TestComputeShaders.cpp b/Tests/TestApp/src/TestComputeShaders.cpp
index 9d6116c..30a3023 100644
--- a/Tests/TestApp/src/TestComputeShaders.cpp
+++ b/Tests/TestApp/src/TestComputeShaders.cpp
@@ -24,7 +24,6 @@
 #include "pch.h"
 #include "TestComputeShaders.h"
 #include "GraphicsUtilities.h"
-#include "ConvenienceFunctions.h"
 
 using namespace Diligent;
 
@@ -40,7 +39,7 @@ void TestComputeShaders::Init( IRenderDevice *pDevice, IDeviceContext *pContext,
         SetStatus(TestResult::Skipped, "Compute shaders are not supported");
         return;
     }
-    
+#if 0
     m_pRenderDevice = pDevice;
     m_pDeviceContext = pContext;
     const auto* BackBufferFmt = pDevice->GetTextureFormatInfo(pSwapChain->GetDesc().ColorBufferFormat).Name;
@@ -50,13 +49,16 @@ void TestComputeShaders::Init( IRenderDevice *pDevice, IDeviceContext *pContext,
         pScriptParser->SetGlobalVariable( "extBackBufferFormat", BackBufferFmt );
         pScriptParser->SetGlobalVariable( "extDepthBufferFormat", DepthBufferFmt );
     } );
+#endif
 }
     
 void TestComputeShaders::Draw()
 {
+#if 0
     if(!m_pDeviceContext)
         return;
     
     m_pRenderScript->Run( m_pDeviceContext, "Render" );
     SetStatus(TestResult::Succeeded);
+#endif
 }
diff --git a/Tests/TestApp/src/TestRenderTarget.cpp b/Tests/TestApp/src/TestRenderTarget.cpp
index 7a18990..033dffc 100644
--- a/Tests/TestApp/src/TestRenderTarget.cpp
+++ b/Tests/TestApp/src/TestRenderTarget.cpp
@@ -24,7 +24,6 @@
 #include "pch.h"
 #include "TestRenderTarget.h"
 #include "GraphicsUtilities.h"
-#include "ConvenienceFunctions.h"
 
 using namespace Diligent;
 
@@ -40,6 +39,7 @@ void TestRenderTarget::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
     return;
 #endif
     
+#if 0
     m_pRenderDevice = pDevice;
     m_pDeviceContext = pDeviceContext;
     m_pRenderScript = CreateRenderScriptFromFile( "TestRenderTargets.lua", pDevice, pDeviceContext, [&]( ScriptParser *pScriptParser )
@@ -54,13 +54,15 @@ void TestRenderTarget::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         pScriptParser->SetGlobalVariable( "XExt", fXExtent );
         pScriptParser->SetGlobalVariable( "YExt", fYExtent );
     } );
+#endif
 }
 
 void TestRenderTarget::Draw()
 {
     if(!m_pDeviceContext)
         return;
-    
+#if 0
     m_pRenderScript->Run( m_pDeviceContext, "Render" );
     SetStatus(TestResult::Succeeded);
+#endif
 }
diff --git a/Tests/TestApp/src/TestVPAndSR.cpp b/Tests/TestApp/src/TestVPAndSR.cpp
index 8eac85f..8cd9f86 100644
--- a/Tests/TestApp/src/TestVPAndSR.cpp
+++ b/Tests/TestApp/src/TestVPAndSR.cpp
@@ -24,7 +24,6 @@
 #include "pch.h"
 #include "TestVPAndSR.h"
 #include "GraphicsUtilities.h"
-#include "ConvenienceFunctions.h"
 
 using namespace Diligent;
 
@@ -33,6 +32,7 @@ TestVPAndSR::TestVPAndSR(IRenderDevice *pDevice, IDeviceContext *pContext ) :
 {
     m_pRenderDevice = pDevice;
     m_pDeviceContext = pContext;
+#if 0
     m_pRenderScript = CreateRenderScriptFromFile( "VPAndSRTest.lua", pDevice, pContext, []( ScriptParser *pScriptParser )
     {
         Viewport VP(16.5, 24.25, 156.125, 381.625, 0.25, 0.75);
@@ -44,6 +44,6 @@ TestVPAndSR::TestVPAndSR(IRenderDevice *pDevice, IDeviceContext *pContext ) :
 
     m_pRenderScript->Run( m_pDeviceContext, "SetViewports" );
     m_pRenderScript->Run( m_pDeviceContext, "SetScissorRects" );
-    
+#endif
     SetStatus(TestResult::Succeeded);
 }