more fixes

softwareantics · Jan 14, 2024 · 33404f4 · 33404f4
1 parent 19f8790
commit 33404f4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/FinalEngine.Rendering.OpenGL/Buffers/OpenGLFrameBuffer.cs b/FinalEngine.Rendering.OpenGL/Buffers/OpenGLFrameBuffer.cs
@@ -39,14 +39,10 @@ public OpenGLFrameBuffer(IOpenGLInvoker invoker, IReadOnlyList<IOpenGLTexture>?
 
         if (colorAttachmentCount > 0)
         {
-            Span<DrawBuffersEnum> bufs = stackalloc DrawBuffersEnum[colorAttachmentCount];
-
             for (int i = 0; i < colorAttachmentCount; i++)
             {
-                bufs[i] = DrawBuffersEnum.ColorAttachment0 + i;
+                this.invoker.NamedFramebufferDrawBuffer(this.rendererID, DrawBufferMode.ColorAttachment0 + i);
             }
-
-            this.invoker.NamedFramebufferDrawBuffers(this.rendererID, colorAttachmentCount, ref bufs[0]);
         }
 
         depthTarget?.Attach(FramebufferAttachment.DepthAttachment, this.rendererID);

diff --git a/FinalEngine.Rendering.OpenGL/Invocation/IOpenGLInvoker.cs b/FinalEngine.Rendering.OpenGL/Invocation/IOpenGLInvoker.cs
@@ -136,8 +136,6 @@ void NamedBufferSubData<T3>(int buffer, IntPtr offset, int size, T3[] data)
 
     void NamedFramebufferDrawBuffer(int framebuffer, DrawBufferMode buf);
 
-    void NamedFramebufferDrawBuffers(int fb, int n, ref DrawBuffersEnum bufs);
-
     void NamedFramebufferReadBuffer(int framebuffer, ReadBufferMode buf);
 
     void NamedFramebufferTexture(int framebuffer, FramebufferAttachment attachment, int texture, int level);

diff --git a/FinalEngine.Rendering.OpenGL/Invocation/OpenGLInvoker.cs b/FinalEngine.Rendering.OpenGL/Invocation/OpenGLInvoker.cs
@@ -437,11 +437,6 @@ public void Viewport(Rectangle rectangle)
         GL.Viewport(rectangle);
     }
 
-    public void NamedFramebufferDrawBuffers(int fb, int n, ref DrawBuffersEnum bufs)
-    {
-        GL.NamedFramebufferDrawBuffers(fb, n, ref bufs);
-    }
-
     public void NamedFramebufferDrawBuffer(int framebuffer, DrawBufferMode buf)
     {
         GL.NamedFramebufferDrawBuffer(framebuffer, buf);

diff --git a/FinalEngine.Rendering/RenderingEngine.cs b/FinalEngine.Rendering/RenderingEngine.cs
@@ -48,6 +48,8 @@ public void Render(ICamera camera)
     {
         ArgumentNullException.ThrowIfNull(camera, nameof(camera));
 
+        this.renderDevice.Pipeline.SetFrameBuffer(null);
+        this.renderDevice.Rasterizer.SetViewport(camera.Bounds);
         this.renderDevice.Clear(Color.Black);
 
         this.renderDevice.OutputMerger.SetDepthState(new DepthStateDescription()