ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
auria.mg 2018-01-22 21:17:51 -05:00
parent dea6dc1f3f
commit 8c609c87d9
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/graphics/sp/sp_shader_manager.hpp
View File

@ -40,6 +40,26 @@ enum RenderPass: unsigned int;
class SPShaderManager : public NoCopy class SPShaderManager : public NoCopy
{ {
public:
struct PassInfo
{
std::function<void()> m_use_function;
std::function<void()> m_unuse_function;
std::string m_vertex_shader;
std::string m_fragment_shader;
std::string m_skinned_mesh_shader;
std::vector<std::pair<std::string, std::type_index> > m_uniforms;
std::vector<std::tuple<std::string, std::string, bool, SamplerType> >
m_prefilled_textures;
};
private: private:
typedef std::vector<std::pair< std::string, std::function<void typedef std::vector<std::pair< std::string, std::function<void
(SPUniformAssigner*)> > > UniformAssigners; (SPUniformAssigner*)> > > UniformAssigners;
@ -61,24 +81,6 @@ private:
}}; }};
}; };
struct PassInfo
{
std::function<void()> m_use_function;
std::function<void()> m_unuse_function;
std::string m_vertex_shader;
std::string m_fragment_shader;
std::string m_skinned_mesh_shader;
std::vector<std::pair<std::string, std::type_index> > m_uniforms;
std::vector<std::tuple<std::string, std::string, bool, SamplerType> >
m_prefilled_textures;
};
static SPShaderManager* m_spsm; static SPShaderManager* m_spsm;
std::unordered_map<std::string, std::shared_ptr<SPShader> > m_shaders; std::unordered_map<std::string, std::shared_ptr<SPShader> > m_shaders;