clear updated

lindemeier · Jun 13, 2024 · 38ec492 · 38ec492
1 parent 7b788af
commit 38ec492
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/prgl/FrameBufferObject.hxx b/prgl/FrameBufferObject.hxx
@@ -31,7 +31,7 @@ class FrameBufferObject final {
   const std::shared_ptr<Texture2d>& getTarget() const;
   const std::shared_ptr<Texture2d>& getDepth() const;
 
-  void clear(const std::array<float, 4UL>& clearColor, double clearDepth);
+  void clear(const std::array<float, 4UL>& clearColor);
 
  private:
   FrameBufferObject(const FrameBufferObject&) = delete;

diff --git a/src/ContextImplementation.cxx b/src/ContextImplementation.cxx
@@ -48,8 +48,14 @@ void checkGLError(const char* file, const char* function, int line) {
   }
 }
 
+// if clang is used, the following pragma is needed to suppress the warning
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-function"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
 // http://blog.nobel-joergensen.com/2013/02/17/debugging-opengl-part-2-using-gldebugmessagecallback/
 static void APIENTRY openGlDebugCallback(GLenum /*unused*/, GLenum type,
                                          GLuint id, GLenum severity,
@@ -111,7 +117,11 @@ static void APIENTRY openGlDebugCallback(GLenum /*unused*/, GLenum type,
             << std::endl;
   std::cerr << std::endl;
 }
+#ifdef __clang__
 #pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 
 ContextImplementation::ContextImplementation()
     : ContextImplementation(640, 480, "", 8, 8, 8, 8, 8, 8, 4, false, false,

diff --git a/src/FrameBufferObject.cxx b/src/FrameBufferObject.cxx
@@ -69,21 +69,9 @@ const std::shared_ptr<Texture2d>& FrameBufferObject::getDepth() const {
   return mDepth;
 }
 
-void FrameBufferObject::clear(const std::array<float, 4UL>& clearColor,
-                              double clearDepth) {
-  if (mTarget != nullptr) {
-    mTarget->bind(true);
-    glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
-    glClear(GL_COLOR_BUFFER_BIT);
-    mTarget->bind(false);
-  }
-
-  if (mDepth != nullptr) {
-    mDepth->bind(true);
-    glClearDepth(clearDepth);
-    glClear(GL_DEPTH_BUFFER_BIT);
-    mDepth->bind(false);
-  }
+void FrameBufferObject::clear(const std::array<float, 4UL>& clearColor) {
+  glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 }
 
 bool FrameBufferObject::checkStatus() const {