abstract framebuffer object

allen-cell-animated · Dec 20, 2023 · 1245959 · 1245959
1 parent 2c99bc2
commit 1245959
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/renderlib/graphics/IRenderWindow.h b/renderlib/graphics/IRenderWindow.h
@@ -10,6 +10,17 @@ class Scene;
 
 #include <memory>
 
+class IRenderTarget
+{
+public:
+  virtual ~IRenderTarget() {}
+
+  virtual void bind() = 0;
+  virtual void release() = 0;
+  virtual int width() const = 0;
+  virtual int height() const = 0;
+};
+
 class IRenderWindow
 {
 public:
@@ -18,7 +29,7 @@ class IRenderWindow
 
   virtual void initialize(uint32_t w, uint32_t h) = 0;
   virtual void render(const CCamera& camera) = 0;
-  virtual void renderTo(const CCamera& camera, GLFramebufferObject* fbo) = 0;
+  virtual void renderTo(const CCamera& camera, IRenderTarget* fbo) = 0;
   virtual void resize(uint32_t w, uint32_t h) = 0;
   virtual void getSize(uint32_t& w, uint32_t& h) = 0;
   virtual void cleanUpResources() {}

diff --git a/renderlib/graphics/RenderGL.cpp b/renderlib/graphics/RenderGL.cpp
@@ -88,7 +88,7 @@ RenderGL::doClear()
 }
 
 void
-RenderGL::renderTo(const CCamera& camera, GLFramebufferObject* fbo)
+RenderGL::renderTo(const CCamera& camera, IRenderTarget* fbo)
 {
   bool haveScene = prepareToRender();
 

diff --git a/renderlib/graphics/RenderGL.h b/renderlib/graphics/RenderGL.h
@@ -20,7 +20,7 @@ class RenderGL : public IRenderWindow
 
   virtual void initialize(uint32_t w, uint32_t h);
   virtual void render(const CCamera& camera);
-  virtual void renderTo(const CCamera& camera, GLFramebufferObject* fbo);
+  virtual void renderTo(const CCamera& camera, IRenderTarget* fbo);
   virtual void resize(uint32_t w, uint32_t h);
   virtual void getSize(uint32_t& w, uint32_t& h)
   {

diff --git a/renderlib/graphics/RenderGLPT.cpp b/renderlib/graphics/RenderGLPT.cpp
@@ -440,7 +440,7 @@ RenderGLPT::render(const CCamera& camera)
 }
 
 void
-RenderGLPT::renderTo(const CCamera& camera, GLFramebufferObject* fbo)
+RenderGLPT::renderTo(const CCamera& camera, IRenderTarget* fbo)
 {
   doRender(camera);
 

diff --git a/renderlib/graphics/RenderGLPT.h b/renderlib/graphics/RenderGLPT.h
@@ -32,7 +32,7 @@ class RenderGLPT : public IRenderWindow
 
   virtual void initialize(uint32_t w, uint32_t h);
   virtual void render(const CCamera& camera);
-  virtual void renderTo(const CCamera& camera, GLFramebufferObject* fbo);
+  virtual void renderTo(const CCamera& camera, IRenderTarget* fbo);
   virtual void resize(uint32_t w, uint32_t h);
   virtual void getSize(uint32_t& w, uint32_t& h)
   {

diff --git a/renderlib/graphics/gl/Util.h b/renderlib/graphics/gl/Util.h
@@ -4,6 +4,7 @@
 #include "glm.h"
 
 #include "Logging.h"
+#include "graphics/IRenderWindow.h"
 
 #include <string>
 
@@ -89,7 +90,7 @@ class GLTimer
 };
 
 // RAII; must have a current gl context at creation time.
-class GLFramebufferObject
+class GLFramebufferObject : public IRenderTarget
 {
 public:
   GLFramebufferObject(int width, int height, GLint colorInternalFormat);

diff --git a/renderlib_wgpu/RenderWgpuPT.cpp b/renderlib_wgpu/RenderWgpuPT.cpp
@@ -12,7 +12,7 @@ RenderWgpuPT::render(const CCamera& camera)
 {
 }
 void
-RenderWgpuPT::renderTo(const CCamera& camera, GLFramebufferObject* fbo)
+RenderWgpuPT::renderTo(const CCamera& camera, IRenderTarget* fbo)
 {
 }
 void

diff --git a/renderlib_wgpu/RenderWgpuPT.h b/renderlib_wgpu/RenderWgpuPT.h
@@ -15,7 +15,7 @@ class RenderWgpuPT : public IRenderWindow
 
   virtual void initialize(uint32_t w, uint32_t h);
   virtual void render(const CCamera& camera);
-  virtual void renderTo(const CCamera& camera, GLFramebufferObject* fbo);
+  virtual void renderTo(const CCamera& camera, IRenderTarget* fbo);
   virtual void resize(uint32_t w, uint32_t h);
   virtual void getSize(uint32_t& w, uint32_t& h)
   {
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,7 +88,7 @@ RenderGL::doClear() @@
     }
     void
-    RenderGL::renderTo(const CCamera& camera, GLFramebufferObject* fbo)
+    RenderGL::renderTo(const CCamera& camera, IRenderTarget* fbo)
     {
       bool haveScene = prepareToRender();
@@ Expand Down @@