From b771a5339b76f9a5c85ee4d05c2957710e84739e Mon Sep 17 00:00:00 2001
From: Luke Benstead <kazade@gmail.com>
Date: Mon, 25 Mar 2019 12:56:48 +0000
Subject: [PATCH] Send colours as bytes in immediate mode

---
 GL/immediate.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/GL/immediate.c b/GL/immediate.c
index 3bbc9d1..24c7ab4 100644
--- a/GL/immediate.c
+++ b/GL/immediate.c
@@ -23,14 +23,14 @@ static AlignedVector NORMALS;
 
 
 static GLfloat NORMAL[3] = {0.0f, 0.0f, 1.0f};
-static GLfloat COLOR[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+static GLubyte COLOR[4] = {255, 255, 255, 255};
 static GLfloat UV_COORD[2] = {0.0f, 0.0f};
 static GLfloat ST_COORD[2] = {0.0f, 0.0f};
 
 
 void _glInitImmediateMode(GLuint initial_size) {
     aligned_vector_init(&VERTICES, sizeof(GLfloat));
-    aligned_vector_init(&COLOURS, sizeof(GLfloat));
+    aligned_vector_init(&COLOURS, sizeof(GLubyte));
     aligned_vector_init(&UV_COORDS, sizeof(GLfloat));
     aligned_vector_init(&ST_COORDS, sizeof(GLfloat));
     aligned_vector_init(&NORMALS, sizeof(GLfloat));
@@ -65,21 +65,19 @@ void APIENTRY glBegin(GLenum mode) {
 }
 
 void APIENTRY glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) {
+    COLOR[0] = (GLubyte)(r * 255);
+    COLOR[1] = (GLubyte)(g * 255);
+    COLOR[2] = (GLubyte)(b * 255);
+    COLOR[3] = (GLubyte)(a * 255);
+}
+
+void APIENTRY glColor4ub(GLubyte r, GLubyte  g, GLubyte b, GLubyte a) {
     COLOR[0] = r;
     COLOR[1] = g;
     COLOR[2] = b;
     COLOR[3] = a;
 }
 
-void APIENTRY glColor4ub(GLubyte r, GLubyte  g, GLubyte b, GLubyte a) {
-    glColor4f(
-        ((GLfloat) r) / 255.0f,
-        ((GLfloat) g) / 255.0f,
-        ((GLfloat) b) / 255.0f,
-        ((GLfloat) a) / 255.0f
-    );
-}
-
 void APIENTRY glColor4fv(const GLfloat* v) {
     glColor4f(v[0], v[1], v[2], v[3]);
 }
@@ -90,7 +88,10 @@ void APIENTRY glColor3f(GLfloat r, GLfloat g, GLfloat b) {
 }
 
 void APIENTRY glColor3ub(GLubyte red, GLubyte green, GLubyte blue) {
-    glColor3f((float) red / 255, (float) green / 255, (float) blue / 255);
+    COLOR[0] = red;
+    COLOR[1] = green;
+    COLOR[2] = blue;
+    COLOR[3] = 255;
 }
 
 void APIENTRY glColor3fv(const GLfloat* v) {
@@ -185,7 +186,7 @@ void APIENTRY glEnd() {
     glEnableClientState(GL_NORMAL_ARRAY);
 
     glVertexPointer(3, GL_FLOAT, 0, VERTICES.data);
-    glColorPointer(4, GL_FLOAT, 0, COLOURS.data);
+    glColorPointer(4, GL_UNSIGNED_BYTE, 0, COLOURS.data);
     glNormalPointer(GL_FLOAT, 0, NORMALS.data);
 
     GLint activeTexture;