Shader first pass

src/duskgl/assert/assertgl.h

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "assert/assert.h"
+#include "error/errorgl.h"
+
+#define assertNoGLError(message) \
+  assertTrue(errorGLCheck().code == ERROR_OK, message)
+
+// EOF

src/duskgl/display/CMakeLists.txt

@@ -13,4 +13,5 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
 add_subdirectory(camera)
 add_subdirectory(framebuffer)
 add_subdirectory(texture)
-add_subdirectory(mesh)
+add_subdirectory(mesh)
+add_subdirectory(shader)

src/duskgl/display/camera/cameragl.c

@@ -8,7 +8,7 @@
 #include "display/camera/camera.h"
 #include "display/framebuffer/framebuffer.h"
 #include "display/screen/screen.h"
-#include "assert/assert.h"
+#include "assert/assertgl.h"
 
 void cameraPushMatrixGL(camera_t *camera) {
   assertNotNull(camera, "Not a camera component");
@@ -117,16 +117,19 @@ void cameraPushMatrixGL(camera_t *camera) {
       assertUnreachable("Invalid camera view type");
   }
 
-  glPushMatrix();
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glLoadMatrixf((const GLfloat*)projection);
+  // glPushMatrix();
+  // glMatrixMode(GL_PROJECTION);
+  // glLoadIdentity();
+  // glLoadMatrixf((const GLfloat*)projection);
+  assertNoGLError("Failed to set projection matrix");
 
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  glLoadMatrixf((const GLfloat*)view);
+  // glMatrixMode(GL_MODELVIEW);
+  // glLoadIdentity();
+  // glLoadMatrixf((const GLfloat*)view);
+  assertNoGLError("Failed to set view matrix");
 }
 
 void cameraPopMatrixGL(void) {
-  glPopMatrix();
+  // glPopMatrix();
+  assertNoGLError("Failed to pop camera matrix");
 }

src/duskgl/display/displaygl.c

@@ -9,8 +9,8 @@
 
 errorret_t displayOpenGLInit(void) {
   glDisable(GL_CULL_FACE);
-  glDisable(GL_LIGHTING);// PSP defaults this on?
-  glShadeModel(GL_SMOOTH); // Fixes color on PSP?
+  // glDisable(GL_LIGHTING);// PSP defaults this on?
+  // glShadeModel(GL_SMOOTH); // Fixes color on PSP?
   errorChain(errorGLCheck());
 
   glEnable(GL_DEPTH_TEST);
@@ -24,9 +24,12 @@ errorret_t displayOpenGLInit(void) {
   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
   errorChain(errorGLCheck());
 
-  glEnableClientState(GL_COLOR_ARRAY);// To confirm: every frame on PSP?
-  glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-  glEnableClientState(GL_VERTEX_ARRAY);
-  errorChain(errorGLCheck());
+  // glEnableClientState(GL_COLOR_ARRAY);// To confirm: every frame on PSP?
+  // glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+  // glEnableClientState(GL_VERTEX_ARRAY);
+  // errorChain(errorGLCheck());
+
+  errorChain(shaderInit(&testShader, &SHADER_UNLIT_DEFINITION));
+
   errorOk();
 }

src/duskgl/display/displaygl.h

@@ -7,8 +7,13 @@
 
 #pragma once
 #include "error/errorgl.h"
+#include "display/shader/shaderunlit.h"
+
+static shadergl_t testShader;
 
 /**
  * Initializes the OpenGL specific contexts for rendering.
+ * 
+ * @return An errorret_t indicating success or failure of the initialization.
  */
 errorret_t displayOpenGLInit(void);

src/duskgl/display/framebuffer/framebuffergl.c

@@ -7,7 +7,7 @@
 
 #include "display/display.h"
 #include "display/framebuffer/framebuffer.h"
-#include "assert/assert.h"
+#include "assert/assertgl.h"
 #include "util/memory.h"
 
 errorret_t frameBufferGLInitBackBuffer(void) {
@@ -86,6 +86,7 @@ void frameBufferGLClear(const uint8_t flags, const color_t color) {
       color.b / 255.0f,
       color.a / 255.0f
     );
+    assertNoGLError("Failed to set clear color");
   }
 
   if(flags & FRAMEBUFFER_CLEAR_DEPTH) {
@@ -93,6 +94,7 @@ void frameBufferGLClear(const uint8_t flags, const color_t color) {
   }
 
   glClear(glFlags);
+  assertNoGLError("Failed to clear framebuffer");
 }
 
 #ifdef DUSK_DISPLAY_SIZE_DYNAMIC

src/duskgl/display/mesh/meshgl.c

@@ -6,7 +6,8 @@
  */
 
 #include "display/mesh/mesh.h"
-#include "assert/assert.h"
+#include "assert/assertgl.h"
+#include "error/errorgl.h"
 
 errorret_t meshInitGL(
   meshgl_t *mesh,
@@ -33,26 +34,27 @@ errorret_t meshDrawGL(
   // PSP style pointer legacy OpenGL
   const GLsizei stride = sizeof(meshvertex_t);
 
-  glColorPointer(
-    sizeof(color4b_t),
-    GL_UNSIGNED_BYTE,
-    stride,
-    (const GLvoid*)&mesh->vertices[offset].color
-  );
-  glTexCoordPointer(
-    MESH_VERTEX_UV_SIZE,
-    GL_FLOAT,
-    stride,
-    (const GLvoid*)&mesh->vertices[offset].uv
-  );
-  glVertexPointer(
-    MESH_VERTEX_POS_SIZE,
-    GL_FLOAT,
-    stride,
-    (const GLvoid*)&mesh->vertices[offset].pos
-  );
+  // glColorPointer(
+  //   sizeof(color4b_t),
+  //   GL_UNSIGNED_BYTE,
+  //   stride,
+  //   (const GLvoid*)&mesh->vertices[offset].color
+  // );
+  // glTexCoordPointer(
+  //   MESH_VERTEX_UV_SIZE,
+  //   GL_FLOAT,
+  //   stride,
+  //   (const GLvoid*)&mesh->vertices[offset].uv
+  // );
+  // glVertexPointer(
+  //   MESH_VERTEX_POS_SIZE,
+  //   GL_FLOAT,
+  //   stride,
+  //   (const GLvoid*)&mesh->vertices[offset].pos
+  // );
 
-  glDrawArrays(mesh->primitiveType, offset, count);
+  // glDrawArrays(mesh->primitiveType, offset, count);
+  // errorChain(errorGLCheck());
 
   errorOk();
 }

src/duskgl/display/shader/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright (c) 2026 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    shadergl.c
+    shaderunlitgl.c
+)

src/duskgl/display/shader/shadergl.c

@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "shadergl.h"
+#include "util/memory.h"
+#include "assert/assertgl.h"
+
+errorret_t shaderInitGL(shadergl_t *shader, const shaderdefinitiongl_t *def) {
+  assertNotNull(shader, "Shader cannot be null");
+  assertNotNull(def, "Shader definition cannot be null");
+
+  memoryZero(shader, sizeof(shadergl_t));
+
+  // Create vertex shader
+  shader->vertexShaderId = glCreateShader(GL_VERTEX_SHADER);
+  errorret_t err = errorGLCheck();
+  errorChain(err);
+
+  glShaderSource(shader->vertexShaderId, 1, &def->vert, NULL);
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteShader(shader->vertexShaderId);
+    errorChain(err);
+  }
+
+  glCompileShader(shader->vertexShaderId);
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteShader(shader->vertexShaderId);
+    errorChain(err);
+  }
+
+  GLint ok = 0;
+  glGetShaderiv(shader->vertexShaderId, GL_COMPILE_STATUS, &ok);
+  if(!ok) {
+    GLchar log[1024];
+    glGetShaderInfoLog(shader->vertexShaderId, sizeof(log), NULL, log);
+    glDeleteShader(shader->vertexShaderId);
+    errorThrow("Vertex shader compilation failed: %s", log);
+  }
+
+  // Create fragment shader
+  shader->fragmentShaderId = glCreateShader(GL_FRAGMENT_SHADER);
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteShader(shader->vertexShaderId);
+    errorChain(err);
+  }
+
+  glShaderSource(shader->fragmentShaderId, 1, &def->frag, NULL);
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteShader(shader->vertexShaderId);
+    glDeleteShader(shader->fragmentShaderId);
+    errorChain(err);
+  }
+
+  glCompileShader(shader->fragmentShaderId);
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteShader(shader->vertexShaderId);
+    glDeleteShader(shader->fragmentShaderId);
+    errorChain(err);
+  }
+
+  glGetShaderiv(shader->fragmentShaderId, GL_COMPILE_STATUS, &ok);
+  if(!ok) {
+    GLchar log[1024];
+    glGetShaderInfoLog(shader->fragmentShaderId, sizeof(log), NULL, log);
+    glDeleteShader(shader->vertexShaderId);
+    glDeleteShader(shader->fragmentShaderId);
+    errorThrow("Fragment shader compilation failed: %s", log);
+  }
+
+  // Create shader program
+  shader->shaderProgramId = glCreateProgram();
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteShader(shader->vertexShaderId);
+    glDeleteShader(shader->fragmentShaderId);
+    errorChain(err);
+  }
+
+  glAttachShader(shader->shaderProgramId, shader->vertexShaderId);
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteProgram(shader->shaderProgramId);
+    glDeleteShader(shader->vertexShaderId);
+    glDeleteShader(shader->fragmentShaderId);
+    errorChain(err);
+  }
+
+  glAttachShader(shader->shaderProgramId, shader->fragmentShaderId);
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteProgram(shader->shaderProgramId);
+    glDeleteShader(shader->vertexShaderId);
+    glDeleteShader(shader->fragmentShaderId);
+    errorChain(err);
+  }
+
+  glLinkProgram(shader->shaderProgramId);
+  err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    glDeleteProgram(shader->shaderProgramId);
+    glDeleteShader(shader->vertexShaderId);
+    glDeleteShader(shader->fragmentShaderId);
+    errorChain(err);
+  }
+
+  ok = 0;
+  glGetProgramiv(shader->shaderProgramId, GL_LINK_STATUS, &ok);
+  if(!ok) {
+    GLchar log[1024];
+    glGetProgramInfoLog(shader->shaderProgramId, sizeof(log), NULL, log);
+    glDeleteProgram(shader->shaderProgramId);
+    glDeleteShader(shader->vertexShaderId);
+    glDeleteShader(shader->fragmentShaderId);
+    errorThrow("Shader program linking failed: %s", log);
+  }
+
+  errorOk();
+}
+
+errorret_t shaderParamGetLocationGL(
+  shadergl_t *shader,
+  const char_t *name,
+  GLint *location
+) {
+  assertNotNull(shader, "Shader cannot be null");
+  assertStrLenMin(name, 1, "Uniform name cannot be empty");
+  assertNotNull(location, "Location cannot be null");
+
+  shadergl_t *shaderGL = (shadergl_t *)shader;
+  *location = glGetUniformLocation(shaderGL->shaderProgramId, name);
+  errorret_t err = errorGLCheck();
+  if(err.code != ERROR_OK) {
+    errorChain(err);
+  }
+  
+  errorOk();
+}
+
+errorret_t shaderSetMatrixGL(
+  shadergl_t *shader,
+  const char_t *name,
+  const mat4 mat
+) {
+  assertNotNull(shader, "Shader cannot be null");
+  assertNotNull(mat, "Matrix data cannot be null");
+  assertStrLenMin(name, 1, "Uniform name cannot be empty");
+
+  GLint location;
+  errorChain(shaderParamGetLocationGL(shader, name, &location));
+
+  glUniformMatrix4fv(location, 1, GL_FALSE, (const GLfloat *)mat);
+  errorChain(errorGLCheck());
+
+  errorOk();
+}
+
+
+errorret_t shaderBindGL(shadergl_t *shader) {
+  assertNotNull(shader, "Shader cannot be null");
+
+  glUseProgram(shader->shaderProgramId);
+  errorChain(errorGLCheck());
+
+  errorOk();
+}
+
+errorret_t shaderDisposeGL(shadergl_t *shader) {
+  assertNotNull(shader, "Shader cannot be null");
+
+  if(shader->shaderProgramId != 0) {
+    glDeleteProgram(shader->shaderProgramId);
+    errorChain(errorGLCheck());
+  }
+  
+  if(shader->vertexShaderId != 0) {
+    glDeleteShader(shader->vertexShaderId);
+    errorChain(errorGLCheck());
+  }
+
+  if(shader->fragmentShaderId != 0) {
+    glDeleteShader(shader->fragmentShaderId);
+    errorChain(errorGLCheck());
+  }
+
+  assertNoGLError("Failed disposing shader");
+  memoryZero(shader, sizeof(shadergl_t));
+  errorOk();
+}

src/duskgl/display/shader/shadergl.h

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "error/errorgl.h"
+
+typedef struct {
+  GLuint shaderProgramId;
+  GLuint vertexShaderId;
+  GLuint fragmentShaderId;
+} shadergl_t;
+
+typedef struct {
+  const char_t *vert;
+  const char_t *frag;
+} shaderdefinitiongl_t;
+
+/**
+ * Initializes a shader.
+ * 
+ * @param shader The shader to initialize.
+ * @param def The definition of the shader to initialize with.
+ * @return An errorret_t indicating success or failure.
+ */
+errorret_t shaderInitGL(shadergl_t *shader, const shaderdefinitiongl_t *def);
+
+/**
+ * Binds a shader for use in rendering.
+ * 
+ * @param shader The shader to bind.
+ * @return An errorret_t indicating success or failure.
+ */
+errorret_t shaderBindGL(shadergl_t *shader);
+
+/**
+ * Retrieves the location of a shader uniform parameter.
+ * 
+ * @param shader The shader to query.
+ * @param name The name of the uniform parameter.
+ * @param location Output parameter to receive the location of the uniform.
+ * @return An errorret_t indicating success or failure.
+ */
+errorret_t shaderParamGetLocationGL(
+  shadergl_t *shader,
+  const char_t *name,
+  GLint *location
+);
+
+/**
+ * Sets a mat4 uniform parameter in the shader.
+ * 
+ * @param shader The shader to update.
+ * @param name The name of the uniform parameter.
+ * @param mat The 4x4 matrix data to set.
+ * @return An errorret_t indicating success or failure.
+ */
+errorret_t shaderSetMatrixGL(
+  shadergl_t *shader,
+  const char_t *name,
+  const mat4 matrix
+);
+
+/**
+ * Disposes of a shader, freeing any associated resources.
+ * 
+ * @param shader The shader to dispose.
+ */
+errorret_t shaderDisposeGL(shadergl_t *shader);

src/duskgl/display/shader/shaderplatform.h

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "shadergl.h"
+
+typedef shadergl_t shaderplatform_t;
+typedef shaderdefinitiongl_t shaderdefinitionplatform_t;
+
+#define shaderInitPlatform shaderInitGL
+#define shaderBindPlatform shaderBindGL
+#define shaderSetMatrixPlatform shaderSetMatrixGL
+// #define shaderSetTexturePlatform shaderSetTextureGL
+#define shaderDisposePlatform shaderDisposeGL

src/duskgl/display/shader/shaderunlitgl.c

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "display/shader/shaderunlit.h"
+
+shaderdefinition_t SHADER_UNLIT_DEFINITION = {
+  .vert =
+    "#version 330 core\n"
+    "layout(location = 0) in vec3 aPos;\n"
+    "layout(location = 1) in vec2 aTexCoord;\n"
+    "uniform mat4 u_Proj;\n"
+    "uniform mat4 u_View;\n"
+    "uniform mat4 u_Model;\n"
+    "out vec2 v_TexCoord;\n"
+    "void main() {\n"
+    "  gl_Position = u_Proj * u_View * u_Model * vec4(aPos, 1.0);\n"
+    "  v_TexCoord = aTexCoord;\n"
+    "}\n",
+
+  .frag =
+    "#version 330 core\n"
+    "in vec2 v_TexCoord;\n"
+    "out vec4 FragColor;\n"
+    "uniform sampler2D u_Texture;\n"
+    "void main() {\n"
+    "  FragColor = texture(u_Texture, v_TexCoord);\n"
+    "}\n"
+};