gl_utils: Rename Framebuffer to avoid symbol collision

Avoid collision with Drm Framebuffer

src/video_display/opengl_conversions.cpp

@@ -161,7 +161,7 @@ class Rendering_convertor : public Frame_convertor{
 
         GlProgram program;
         Model quad;
-        Framebuffer fbuf;
+        Gl_framebuffer fbuf;
         GLint width_uniform_location = -1;
         Texture input_tex;
 };

src/video_display/opengl_panorama.cpp

@@ -72,7 +72,6 @@ void main(){
 }
 )END";
 
-
 PanoramaScene::PanoramaScene(): PanoramaScene(GlProgram(persp_vert_src, persp_frag_src),
         Model::get_sphere()) { }
 

src/video_display/opengl_utils.cpp

@@ -301,7 +301,7 @@ void Texture::allocate(){
 }
 
 
-void Framebuffer::attach_texture(GLuint tex){
+void Gl_framebuffer::attach_texture(GLuint tex){
         glBindTexture(GL_TEXTURE_2D, tex);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

src/video_display/opengl_utils.hpp

@@ -202,23 +202,23 @@ class Texture{
 /**
  * RAII wrapper for an OpenGL framebuffer object
  */
-class Framebuffer{
+class Gl_framebuffer{
 public:
         /**
          * Constructs a new framebuffer object
          */
-        Framebuffer(){
+        Gl_framebuffer(){
                 glGenFramebuffers(1, &fbo);
         }
 
-        ~Framebuffer(){
+        ~Gl_framebuffer(){
                 glDeleteFramebuffers(1, &fbo);
         }
 
-        Framebuffer(const Framebuffer&) = delete;
-        Framebuffer(Framebuffer&& o) { swap(o); }
-        Framebuffer& operator=(const Framebuffer&) = delete;
-        Framebuffer& operator=(Framebuffer&& o) { swap(o); return *this; }
+        Gl_framebuffer(const Gl_framebuffer&) = delete;
+        Gl_framebuffer(Gl_framebuffer&& o) { swap(o); }
+        Gl_framebuffer& operator=(const Gl_framebuffer&) = delete;
+        Gl_framebuffer& operator=(Gl_framebuffer&& o) { swap(o); return *this; }
 
         /**
          * Returns the underlying OpenGL framebuffer id
@@ -242,7 +242,7 @@ class Framebuffer{
         }
 
 private:
-        void swap(Framebuffer& o){
+        void swap(Gl_framebuffer& o){
                 std::swap(fbo, o.fbo);
         }
 

src/video_display/openxr_gl.cpp

@@ -306,7 +306,7 @@ class Gl_interop_swapchain{
                 return images[idx].image;
         }
 
-        Framebuffer& get_framebuffer(size_t idx){
+        Gl_framebuffer& get_framebuffer(size_t idx){
                 return framebuffers[idx];
         }
 
@@ -342,7 +342,7 @@ class Gl_interop_swapchain{
         }
 
         Openxr_swapchain xr_swapchain;
-        std::vector<Framebuffer> framebuffers;
+        std::vector<Gl_framebuffer> framebuffers;
         std::vector<XrSwapchainImageOpenGLKHR> images;
 };