From 571bdc72bec626bbc3cb5f61fb689fb23de2ef67 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Fri, 1 Mar 2019 19:00:26 -0800
Subject: Updated renderscript to work with the new API

---
 RenderScript/include/ShaderParser.h | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'RenderScript/include/ShaderParser.h')

diff --git a/RenderScript/include/ShaderParser.h b/RenderScript/include/ShaderParser.h
index f3fae7e..e833364 100644
--- a/RenderScript/include/ShaderParser.h
+++ b/RenderScript/include/ShaderParser.h
@@ -34,13 +34,13 @@ namespace Diligent
     class ShaderParser final : public EngineObjectParserCommon<IShader>
     {
     public:
-        ShaderParser( IRenderDevice *pRenderDevice, lua_State *L, const String& ResMappingMetatableName);
+        ShaderParser( IRenderDevice *pRenderDevice, lua_State *L);
         static const Char* ShaderLibName;
 
-        // ShaderCreationAttribs structure does not provide storage for the Name field,
+        // ShaderCreateInfo structure does not provide storage for the Name field,
         // nor does it provide storage for FilePath.
-        // We need to use ShaderCreationAttribsWrapper to be able to store the data.
-        struct ShaderCreationAttribsWrapper : ShaderCreationAttribs
+        // We need to use ShaderCreateInfoWrapper to be able to store the data.
+        struct ShaderCreateInfoWrapper : ShaderCreateInfo
         {
             String NameBuffer;
             String SourceBuffer;
@@ -49,10 +49,6 @@ namespace Diligent
             String SearchDirectoriesBuffer;
             String CombinedSamplerSuffixBuffer;
             const char *SearchDirectories = nullptr;
-            std::vector<ShaderVariableDesc> m_VarDescBuffer;
-            std::vector<String> m_VarNamesBuffer;
-            std::vector<StaticSamplerDesc> m_StaticSamplersBuffer;
-            std::vector<String> m_StaticSamplerTexNamesBuffer;
         };
 
     protected:
@@ -60,14 +56,6 @@ namespace Diligent
         virtual void ReadField( lua_State *L, void *pData, const Char *Field )override final;
 
     private:
-
-        ClassMethodCaller< ShaderParser > m_BindResourcesBinding;
-        int BindResources( lua_State *L );
-
-        const String m_ResMappingMetatableName;
-
         EnumMapping<SHADER_SOURCE_LANGUAGE>   m_ShaderSourceLangEnumMapping;
-
-        BindShaderResourcesFlagEnumMapping m_BindShaderResFlagEnumMapping;
     };
 }
-- 
cgit v1.2.3