From 35060ab24e7b87608bd1f1842276977b4ee7ad79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 19 May 2021 20:32:16 +0200 Subject: [PATCH] Fix minor stuff --- bin/resources/fullscreen.frag.shader | Bin 382 -> 382 bytes bin/resources/fullscreen.vert.shader | Bin 474 -> 474 bytes src/Nazara/Graphics/ModelInstance.cpp | 1 - .../OpenGLRenderer/OpenGLFboFramebuffer.cpp | 2 +- 4 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/resources/fullscreen.frag.shader b/bin/resources/fullscreen.frag.shader index 8124d2919ddf4550cb8ec57163fd3b38d81e5269..27e9cb993335c5106ceb733df1870d4241f382e0 100644 GIT binary patch delta 70 zcmeyz^p8ozFW4i9fq{V$h{b@I1&H}4iYPJ)O*GR35~*g40u$%BFbYq6sK_WfnVB(% RUjnFv9f;ZTOG^q$O90Vo4XywH delta 70 zcmeyz^p8ozFW4i9fq{V$h(&>z1&H}3iYPJ)PBha45~*g4{1fN6FbYk4sK_WXnVB(% RUmU1}9f;ZTOG^q$O90SZ4W#O^owm6qvZug;99oJ4Hs($pVZyU{Z1N VJVsr937|T5AZE)iEh#810RSFq4)_27 delta 75 zcmcb`e2ZDcFW4i9fq{V$h(&>z8HfcZig+>#PK@(nGetRenderPipelineLayout()->AllocateShaderBinding(); - // TODO: Use StackVector StackVector bindings = NazaraStackVector(ShaderBinding::Binding, 2); if (std::size_t bindingIndex = settings->GetPredefinedBindingIndex(PredefinedShaderBinding::UboInstanceData); bindingIndex != MaterialSettings::InvalidIndex) diff --git a/src/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.cpp b/src/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.cpp index f7923472c..57ad58cd5 100644 --- a/src/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.cpp +++ b/src/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.cpp @@ -31,7 +31,7 @@ namespace Nz switch (PixelFormatInfo::GetContent(textureFormat)) { case PixelFormatContent_ColorRGBA: - attachment = GL_COLOR_ATTACHMENT0 + colorAttachmentCount; + attachment = static_cast(GL_COLOR_ATTACHMENT0 + colorAttachmentCount); colorAttachmentCount++; break;