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: db0ee5afb38004d856fcec24b17eb1a5e588b1eb [formerly daed416404ab75182de5b90b2963b7cf291d404c] [formerly e0662145c3acac11590b804dd95754fa9fa2e284 [formerly e373d5aed8818a7bd7b574915f96bedb81e62643]]
Former-commit-id: a3c3ea331053d1e697ec76f1adda0ff5797cb66e [formerly 0034ddafa68e6810fdb2e64daf79c7e4a127f5a4]
Former-commit-id: a5027780263c62009f4a34df8110b50960465059
This commit is contained in:
Lynix 2016-08-14 17:58:38 +02:00
parent c30209d44a
commit b2f8fc2701
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;