sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics/MaterialPipeline: Fix default pipeline not having an ubershader 

Former-commit-id: 740af3fb62dff7b07f184e8d13d00937b5e36f7d [formerly aedb01d9208c9e6579cae5d03e5a0c90424383f7] [formerly eb67802a9d6a3d67590f5c61e4b75c518da792ef [formerly d83b7c4c0241d43fa7d85741f67866303c1e86b6]]
Former-commit-id: c89e8612ad25f22a4bc471e916221c7338765b4d [formerly 1a72ceeeb9fa47b40fabfa2c6b98231e918bd18d]
Former-commit-id: 105238d08f0f41832751e0768324066c853b84b8
This commit is contained in:
Lynix 2016-08-14 17:58:38 +02:00
parent 56e320baa3
commit 30380d2979
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Nazara/Graphics/MaterialPipeline.cpp
View File

@ -58,6 +58,8 @@ namespace Nz
void MaterialPipeline::GenerateRenderPipeline(UInt32 flags) const void MaterialPipeline::GenerateRenderPipeline(UInt32 flags) const
{ {
NazaraAssert(m_pipelineInfo.uberShader, "Material pipeline has no uber shader");
ParameterList list; ParameterList list;
list.SetParameter("ALPHA_MAPPING", m_pipelineInfo.hasAlphaMap); list.SetParameter("ALPHA_MAPPING", m_pipelineInfo.hasAlphaMap);
list.SetParameter("ALPHA_TEST", m_pipelineInfo.alphaTest); list.SetParameter("ALPHA_TEST", m_pipelineInfo.alphaTest);
@ -136,6 +138,7 @@ namespace Nz
// Once the base shaders are registered, we can now set some default materials // Once the base shaders are registered, we can now set some default materials
MaterialPipelineInfo pipelineInfo; MaterialPipelineInfo pipelineInfo;
pipelineInfo.uberShader = UberShaderLibrary::Get("Basic");
// Basic 2D - No depth write/face culling // Basic 2D - No depth write/face culling
pipelineInfo.depthWrite = false; pipelineInfo.depthWrite = false;