From c6caf491abb5321b2baddcf56fbe66a5e4624b3f Mon Sep 17 00:00:00 2001 From: lisyarus Date: Fri, 16 Oct 2020 07:41:46 +0300 Subject: [PATCH] Null framebuffer is returned by reference --- libs/gfx/include/psemek/gfx/framebuffer.hpp | 2 +- libs/gfx/source/framebuffer.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/gfx/include/psemek/gfx/framebuffer.hpp b/libs/gfx/include/psemek/gfx/framebuffer.hpp index e5797ffe..dbe8e357 100644 --- a/libs/gfx/include/psemek/gfx/framebuffer.hpp +++ b/libs/gfx/include/psemek/gfx/framebuffer.hpp @@ -17,7 +17,7 @@ namespace psemek::gfx framebuffer(framebuffer const &) = delete; framebuffer & operator = (framebuffer const &) = delete; - static framebuffer null(); + static framebuffer const & null(); GLuint id() const { return id_; } diff --git a/libs/gfx/source/framebuffer.cpp b/libs/gfx/source/framebuffer.cpp index f95109d7..63c8569b 100644 --- a/libs/gfx/source/framebuffer.cpp +++ b/libs/gfx/source/framebuffer.cpp @@ -42,9 +42,10 @@ namespace psemek::gfx reset(); } - framebuffer framebuffer::null() + framebuffer const & framebuffer::null() { - return framebuffer(nullptr); + static framebuffer f(nullptr); + return f; } void framebuffer::bind() const