From 8c609c87d91dc30d18f7273dfaeeeef32c4d06d8 Mon Sep 17 00:00:00 2001 From: "auria.mg" Date: Mon, 22 Jan 2018 21:17:51 -0500 Subject: [PATCH] Fix compilation --- src/graphics/sp/sp_shader_manager.hpp | 38 ++++++++++++++------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/graphics/sp/sp_shader_manager.hpp b/src/graphics/sp/sp_shader_manager.hpp index 158c1f21f..3695a2e6c 100644 --- a/src/graphics/sp/sp_shader_manager.hpp +++ b/src/graphics/sp/sp_shader_manager.hpp @@ -40,6 +40,26 @@ enum RenderPass: unsigned int; class SPShaderManager : public NoCopy { +public: + + struct PassInfo + { + std::function m_use_function; + + std::function m_unuse_function; + + std::string m_vertex_shader; + + std::string m_fragment_shader; + + std::string m_skinned_mesh_shader; + + std::vector > m_uniforms; + + std::vector > + m_prefilled_textures; + }; + private: typedef std::vector > > UniformAssigners; @@ -61,24 +81,6 @@ private: }}; }; - struct PassInfo - { - std::function m_use_function; - - std::function m_unuse_function; - - std::string m_vertex_shader; - - std::string m_fragment_shader; - - std::string m_skinned_mesh_shader; - - std::vector > m_uniforms; - - std::vector > - m_prefilled_textures; - }; - static SPShaderManager* m_spsm; std::unordered_map > m_shaders;