Move and import error library from clib.

1 files changed, 34 insertions, 33 deletions

diff --git a/gfx/src/render/framebuffer.c b/gfx/src/render/framebuffer.c
index 323ef56..84ade4a 100644
--- a/gfx/src/render/framebuffer.c
+++ b/gfx/src/render/framebuffer.c
@@ -3,12 +3,12 @@
 #include "renderbuffer.h"
 #include "texture.h"
 
-#include <gfx/error.h>
+#include <error.h>
 
 #include <assert.h>
 
-static void framebuffer_attach_colour(FrameBuffer* framebuffer,
-                                      const FrameBufferAttachment* attachment) {
+static void framebuffer_attach_colour(
+    FrameBuffer* framebuffer, const FrameBufferAttachment* attachment) {
   assert(framebuffer);
   assert(attachment);
 
@@ -16,27 +16,28 @@ static void framebuffer_attach_colour(FrameBuffer* framebuffer,
   case FrameBufferNoAttachment:
     break;
   case FrameBufferTexture:
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
-                           attachment->texture.texture->id,
-                           attachment->texture.mip_level);
+    glFramebufferTexture2D(
+        GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+        attachment->texture.texture->id, attachment->texture.mip_level);
     break;
   case FrameBufferCubemapTexture:
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                           to_GL_cubemap_face(attachment->cubemap.face),
-                           attachment->cubemap.texture->id,
-                           attachment->cubemap.mip_level);
+    glFramebufferTexture2D(
+        GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+        to_GL_cubemap_face(attachment->cubemap.face),
+        attachment->cubemap.texture->id, attachment->cubemap.mip_level);
     break;
   case FrameBufferRenderBuffer:
-    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                              GL_RENDERBUFFER, attachment->renderbuffer->id);
+    glFramebufferRenderbuffer(
+        GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
+        attachment->renderbuffer->id);
     break;
   }
 
   ASSERT_GL;
 }
 
-static void framebuffer_attach_depth(FrameBuffer* framebuffer,
-                                     const FrameBufferAttachment* attachment) {
+static void framebuffer_attach_depth(
+    FrameBuffer* framebuffer, const FrameBufferAttachment* attachment) {
   assert(framebuffer);
   assert(attachment);
 
@@ -44,33 +45,33 @@ static void framebuffer_attach_depth(FrameBuffer* framebuffer,
   case FrameBufferNoAttachment:
     break;
   case FrameBufferTexture:
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                           GL_DEPTH_COMPONENT, attachment->texture.texture->id,
-                           attachment->texture.mip_level);
+    glFramebufferTexture2D(
+        GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_DEPTH_COMPONENT,
+        attachment->texture.texture->id, attachment->texture.mip_level);
     break;
   // TODO: Could distinguish between colour and depth attachment types to make
   // this a compile-time error.
   case FrameBufferCubemapTexture:
-    gfx_set_error(
-        "Cannot use a cubemap texture as a depth framebuffer attachment");
+    set_error("Cannot use a cubemap texture as a depth framebuffer attachment");
     break;
   case FrameBufferRenderBuffer:
-    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                              GL_RENDERBUFFER, attachment->renderbuffer->id);
+    glFramebufferRenderbuffer(
+        GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
+        attachment->renderbuffer->id);
     break;
   }
 
   ASSERT_GL;
 }
 
-bool gfx_init_framebuffer(FrameBuffer* framebuffer,
-                          const FrameBufferDesc* desc) {
+bool gfx_init_framebuffer(
+    FrameBuffer* framebuffer, const FrameBufferDesc* desc) {
   assert(framebuffer);
   assert(desc);
 
   glGenFramebuffers(1, &framebuffer->id);
   if (!framebuffer->id) {
-    gfx_set_error("glGenFramebuffers() failed");
+    set_error("glGenFramebuffers() failed");
     return false;
   }
 
@@ -84,7 +85,7 @@ bool gfx_init_framebuffer(FrameBuffer* framebuffer,
     framebuffer_attach_colour(framebuffer, &desc->colour);
     framebuffer_attach_depth(framebuffer, &desc->depth);
     if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-      gfx_set_error("glCheckFramebufferStatus() failed");
+      set_error("glCheckFramebufferStatus() failed");
       gfx_del_framebuffer(framebuffer);
       return false;
     }
@@ -95,8 +96,8 @@ bool gfx_init_framebuffer(FrameBuffer* framebuffer,
   return true;
 }
 
-bool gfx_framebuffer_attach_colour(FrameBuffer* framebuffer,
-                                   const FrameBufferAttachment* attachment) {
+bool gfx_framebuffer_attach_colour(
+    FrameBuffer* framebuffer, const FrameBufferAttachment* attachment) {
   assert(framebuffer);
   assert(attachment);
 
@@ -104,14 +105,14 @@ bool gfx_framebuffer_attach_colour(FrameBuffer* framebuffer,
   glBindFramebuffer(GL_FRAMEBUFFER, framebuffer->id);
   framebuffer_attach_colour(framebuffer, attachment);
   if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-    gfx_set_error("glCheckFramebufferStatus() failed");
+    set_error("glCheckFramebufferStatus() failed");
     return false;
   }
   return true;
 }
 
-bool gfx_framebuffer_attach_depth(FrameBuffer* framebuffer,
-                                  const FrameBufferAttachment* attachment) {
+bool gfx_framebuffer_attach_depth(
+    FrameBuffer* framebuffer, const FrameBufferAttachment* attachment) {
   assert(framebuffer);
   assert(attachment);
 
@@ -119,7 +120,7 @@ bool gfx_framebuffer_attach_depth(FrameBuffer* framebuffer,
   glBindFramebuffer(GL_FRAMEBUFFER, framebuffer->id);
   framebuffer_attach_depth(framebuffer, attachment);
   if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-    gfx_set_error("glCheckFramebufferStatus() failed");
+    set_error("glCheckFramebufferStatus() failed");
     return false;
   }
   return true;
@@ -143,8 +144,8 @@ void gfx_deactivate_framebuffer(const FrameBuffer* framebuffer) {
   glBindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
-void gfx_framebuffer_set_viewport(FrameBuffer* framebuffer, int x, int y,
-                                  int width, int height) {
+void gfx_framebuffer_set_viewport(
+    FrameBuffer* framebuffer, int x, int y, int width, int height) {
   assert(framebuffer);
   glViewport(x, y, width, height);
 }