Make color optional

src/duskgl/display/mesh/meshgl.c

@@ -26,8 +26,11 @@ errorret_t meshInitGL(
 
   #ifdef DUSK_OPENGL_LEGACY
     // Nothing needed.
-    glEnableClientState(GL_COLOR_ARRAY);
-    errorChain(errorGLCheck());
+    #if MESH_ENABLE_COLOR
+      glEnableClientState(GL_COLOR_ARRAY);
+      errorChain(errorGLCheck());
+    #endif
+    
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
     errorChain(errorGLCheck());
     glEnableClientState(GL_VERTEX_ARRAY);
@@ -79,17 +82,19 @@ errorret_t meshInitGL(
     glEnableVertexAttribArray(1);
     errorChain(errorGLCheck());
 
-    glVertexAttribPointer(
-      2,
-      sizeof(color_t) / sizeof(GLubyte),
-      GL_UNSIGNED_BYTE,
-      GL_TRUE,
-      sizeof(meshvertex_t),
-      (const GLvoid*)offsetof(meshvertex_t, color)
-    );
-    errorChain(errorGLCheck());
-    glEnableVertexAttribArray(2);
-    errorChain(errorGLCheck());
+    #if MESH_ENABLE_COLOR
+      glVertexAttribPointer(
+        2,
+        sizeof(color_t) / sizeof(GLubyte),
+        GL_UNSIGNED_BYTE,
+        GL_TRUE,
+        sizeof(meshvertex_t),
+        (const GLvoid*)offsetof(meshvertex_t, color)
+      );
+      errorChain(errorGLCheck());
+      glEnableVertexAttribArray(2);
+      errorChain(errorGLCheck());
+    #endif
 
     // Unbind VAO and VBO to prevent accidental modification
     glBindBuffer(GL_ARRAY_BUFFER, 0);
@@ -133,18 +138,22 @@ errorret_t meshDrawGL(
     // Legacy pointer style rendering
     const GLsizei stride = sizeof(meshvertex_t);
 
-    glColorPointer(
-      sizeof(color4b_t),
-      GL_UNSIGNED_BYTE,
-      stride,
-      (const GLvoid*)&mesh->vertices[offset].color
-    );
+    #if MESH_ENABLE_COLOR
+      glColorPointer(
+        sizeof(color4b_t),
+        GL_UNSIGNED_BYTE,
+        stride,
+        (const GLvoid*)&mesh->vertices[offset].color
+      );
+    #endif
+
     glTexCoordPointer(
       MESH_VERTEX_UV_SIZE,
       GL_FLOAT,
       stride,
       (const GLvoid*)&mesh->vertices[offset].uv[0]
     );
+    
     glVertexPointer(
       MESH_VERTEX_POS_SIZE,
       GL_FLOAT,

src/duskgl/display/shader/shaderunlitgl.c

@@ -90,7 +90,9 @@
         // Attributes
         "layout(location = 0) in vec3 a_Pos;\n"
         "layout(location = 1) in vec2 a_TexCoord;\n"
-        "layout(location = 2) in vec4 a_Color;\n"
+        #if MESH_ENABLE_COLOR
+          "layout(location = 2) in vec4 a_Color;\n"
+        #endif
         // Uniforms
         "uniform mat4 u_Proj;\n"
         "uniform mat4 u_View;\n"
@@ -100,7 +102,11 @@
         "out vec2 v_TexCoord;\n"
         "void main() {\n"
         "  gl_Position = u_Proj * u_View * u_Model * vec4(a_Pos, 1.0);\n"
+        #if MESH_ENABLE_COLOR
         "  v_Color = a_Color;\n"
+        #else
+        "  v_Color = vec4(1.0);\n"
+        #endif
         "  v_TexCoord = a_TexCoord;\n"
         "}\n",
       #else
@@ -108,7 +114,9 @@
         // Attributes
         "layout(location = 0) in vec3 a_Pos;\n"
         "layout(location = 1) in vec2 a_TexCoord;\n"
-        "layout(location = 2) in vec4 a_Color;\n"
+        #if MESH_ENABLE_COLOR
+          "layout(location = 2) in vec4 a_Color;\n"
+        #endif
         // Uniforms
         "uniform mat4 u_Proj;\n"
         "uniform mat4 u_View;\n"
@@ -118,7 +126,11 @@
         "out vec2 v_TexCoord;\n"
         "void main() {\n"
         "  gl_Position = u_Proj * u_View * u_Model * vec4(a_Pos, 1.0);\n"
-        "  v_Color = a_Color;\n"
+        #if MESH_ENABLE_COLOR
+          "  v_Color = a_Color;\n"
+        #else
+          "  v_Color = vec4(1.0);\n"
+        #endif
         "  v_TexCoord = a_TexCoord;\n"
         "}\n",
       #endif