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

Fix minor stuff

This commit is contained in:
Jérôme Leclercq 2021-05-19 20:32:16 +02:00
parent 49a2cda0a1
commit 35060ab24e
4 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/resources/fullscreen.frag.shader
View File

Binary file not shown.

BIN
bin/resources/fullscreen.vert.shader
View File

Binary file not shown.

1
src/Nazara/Graphics/ModelInstance.cpp
View File

@ -21,7 +21,6 @@ namespace Nz
m_shaderBinding = settings->GetRenderPipelineLayout()->AllocateShaderBinding(); m_shaderBinding = settings->GetRenderPipelineLayout()->AllocateShaderBinding();
// TODO: Use StackVector
StackVector<ShaderBinding::Binding> bindings = NazaraStackVector(ShaderBinding::Binding, 2); StackVector<ShaderBinding::Binding> bindings = NazaraStackVector(ShaderBinding::Binding, 2);
if (std::size_t bindingIndex = settings->GetPredefinedBindingIndex(PredefinedShaderBinding::UboInstanceData); bindingIndex != MaterialSettings::InvalidIndex) if (std::size_t bindingIndex = settings->GetPredefinedBindingIndex(PredefinedShaderBinding::UboInstanceData); bindingIndex != MaterialSettings::InvalidIndex)

2
src/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.cpp
View File

@ -31,7 +31,7 @@ namespace Nz
switch (PixelFormatInfo::GetContent(textureFormat)) switch (PixelFormatInfo::GetContent(textureFormat))
{ {
case PixelFormatContent_ColorRGBA: case PixelFormatContent_ColorRGBA:
attachment = GL_COLOR_ATTACHMENT0 + colorAttachmentCount; attachment = static_cast<GLenum>(GL_COLOR_ATTACHMENT0 + colorAttachmentCount);
colorAttachmentCount++; colorAttachmentCount++;
break; break;