From 571bdc72bec626bbc3cb5f61fb689fb23de2ef67 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 1 Mar 2019 19:00:26 -0800 Subject: Updated renderscript to work with the new API --- RenderScript/include/ShaderVariableParser.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'RenderScript/include/ShaderVariableParser.h') diff --git a/RenderScript/include/ShaderVariableParser.h b/RenderScript/include/ShaderVariableParser.h index e75d99e..6b97e89 100644 --- a/RenderScript/include/ShaderVariableParser.h +++ b/RenderScript/include/ShaderVariableParser.h @@ -35,13 +35,13 @@ namespace Diligent { public: ShaderVariableParser( IRenderDevice *pRenderDevice, lua_State *L, - const String &ShaderLibMetatableName, + const String &PSOLibMetatableName, const String &BufferLibMetatableName, const String &BufferViewLibMetatableName, const String &TexViewMetatableName ); static const Char* ShaderVariableLibName; - void GetObjectByName( lua_State *L, const Char *ShaderName, IShaderVariable** ppObject ); + void GetObjectByName( lua_State *L, const Char *ShaderName, IShaderResourceVariable** ppObject ); protected: virtual void CreateObj( lua_State *L )override final; @@ -51,15 +51,17 @@ namespace Diligent virtual void PushExistingObject( lua_State *L, const void *pObject )override final; private: - const String m_ShaderLibMetatableName; + const String m_PSOLibMetatableName; const String m_BufferLibMetatableName; const String m_BufferViewLibMetatableName; const String m_TexViewMetatableName; + ShaderTypeEnumMapping m_ShaderTypeEnumMapping; + int Set( lua_State *L ); ClassMethodCaller < ShaderVariableParser > m_SetBinding; - ClassMethodCaller m_GetShaderVariableBinding; - int GetShaderVariable( lua_State *L ); + ClassMethodCaller m_GetStaticShaderVariableBinding; + int GetStaticShaderVariable( lua_State *L ); }; } -- cgit v1.2.3