Minor stuff

This commit is contained in:
Jérôme Leclercq
2021-08-10 10:35:59 +02:00
parent f5dac32020
commit 7aafcfaae9
8 changed files with 8 additions and 6 deletions

View File

@@ -22,7 +22,7 @@ namespace Nz
namespace
{
const UInt8 r_shader[] = {
#include <Nazara/Graphics/Resources/Shaders/basicmaterial.nzsl.h>
#include <Nazara/Graphics/Resources/Shaders/basic_material.nzsl.h>
};
}

View File

@@ -44,7 +44,7 @@ namespace Nz
}
RenderPipelineInfo renderPipelineInfo;
static_cast<RenderStates&>(renderPipelineInfo).operator=(m_pipelineInfo); // Not my proudest line
static_cast<RenderStates&>(renderPipelineInfo).operator=(m_pipelineInfo); // Not the line I4m the most proud of
renderPipelineInfo.pipelineLayout = m_pipelineInfo.settings->GetRenderPipelineLayout();
@@ -58,6 +58,7 @@ namespace Nz
return m_renderPipelines.emplace_back(Graphics::Instance()->GetRenderDevice()->InstantiateRenderPipeline(std::move(renderPipelineInfo)));
}
/*!
* \brief Returns a reference to a MaterialPipeline built with MaterialPipelineInfo
*

View File

@@ -40,7 +40,7 @@ namespace Nz
ShaderAst::AstReflect reflect;
reflect.Reflect(*m_shaderAst, callbacks);
if (m_shaderStages & shaderStages != m_shaderStages)
if (m_shaderStages & supportedStageType != m_shaderStages)
throw std::runtime_error("shader doesn't support all required shader stages");
if (optionCount >= 64)