From 5e3941de79b573b8798f6a6bcd4eaf544c48cde2 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sun, 12 Nov 2017 19:18:57 -0800
Subject: Updated to version 2.1

---
 RenderScript/include/ConvenienceFunctions.h | 4 ++--
 RenderScript/include/ScriptParser.h         | 6 ++++--
 RenderScript/include/ShaderParser.h         | 1 +
 RenderScript/include/pch.h                  | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'RenderScript/include')

diff --git a/RenderScript/include/ConvenienceFunctions.h b/RenderScript/include/ConvenienceFunctions.h
index 334f4c9..01bcdf4 100644
--- a/RenderScript/include/ConvenienceFunctions.h
+++ b/RenderScript/include/ConvenienceFunctions.h
@@ -52,7 +52,7 @@ Diligent::RefCntAutoPtr<Diligent::ScriptParser> CreateRenderScriptFromFile( cons
             Diligent::FileWrapper ScriptFile(FilePath);
             if( !ScriptFile )
                 LOG_ERROR_AND_THROW( "Failed to open Lua source file" );
-            Diligent::RefCntAutoPtr<Diligent::IDataBlob> pFileData( new Diligent::DataBlobImpl );
+            Diligent::RefCntAutoPtr<Diligent::IDataBlob> pFileData( Diligent::MakeNewRCObj<Diligent::DataBlobImpl>()(0) );
             ScriptFile->Read( pFileData );
             
             // Null-terminator is not read from the stream
@@ -60,7 +60,7 @@ Diligent::RefCntAutoPtr<Diligent::ScriptParser> CreateRenderScriptFromFile( cons
             auto *ScriptText = reinterpret_cast<char*>(pFileData->GetDataPtr());
             ScriptText[pFileData->GetSize() - 1] = 0;
             
-            pScriptParser = new Diligent::ScriptParser( pRenderDevice );
+            pScriptParser = Diligent::MakeNewRCObj<Diligent::ScriptParser>()( pRenderDevice );
             pScriptParser->Parse( ScriptText );
             SetGlobalVars( pScriptParser );
             pScriptParser->Run( pContext );
diff --git a/RenderScript/include/ScriptParser.h b/RenderScript/include/ScriptParser.h
index 828a945..137f0fd 100644
--- a/RenderScript/include/ScriptParser.h
+++ b/RenderScript/include/ScriptParser.h
@@ -33,10 +33,12 @@
 
 namespace Diligent
 {
-    class ScriptParser : public Diligent::RefCountedObject<Diligent::IObject>
+    class ScriptParser : public RefCountedObject<IObject>
     {
     public:
-        ScriptParser( IRenderDevice *pRenderDevice );
+        typedef RefCountedObject<IObject> TBase;
+
+        ScriptParser( IReferenceCounters *pRefCounters, IRenderDevice *pRenderDevice );
         ~ScriptParser();
         
         virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface );
diff --git a/RenderScript/include/ShaderParser.h b/RenderScript/include/ShaderParser.h
index a1df356..b827def 100644
--- a/RenderScript/include/ShaderParser.h
+++ b/RenderScript/include/ShaderParser.h
@@ -52,6 +52,7 @@ namespace Diligent
             String FilePathBuffer;
             String EntryPointBuffer;
             String SearchDirectoriesBuffer;
+            const char *SearchDirectories = nullptr;
             std::vector<ShaderVariableDesc> m_VarDescBuffer;
             std::vector<String> m_VarNamesBuffer;
             std::vector<StaticSamplerDesc> m_StaticSamplersBuffer;
diff --git a/RenderScript/include/pch.h b/RenderScript/include/pch.h
index eec1e6d..ffe6b1c 100644
--- a/RenderScript/include/pch.h
+++ b/RenderScript/include/pch.h
@@ -37,8 +37,8 @@
 #include "lauxlib.h"
 
 #include "BasicTypes.h"
-#include "Errors.h"
 #include "ParsingErrors.h"
+#include "Errors.h"
 
 #include "RefCntAutoPtr.h"
 #include "RenderDevice.h"
-- 
cgit v1.2.3