From aa20bb20b2914a82acef19fd5aab5b115a9d2610 Mon Sep 17 00:00:00 2001
From: Luke Benstead <kazade@gmail.com>
Date: Fri, 8 May 2020 19:42:31 +0100
Subject: [PATCH] Performance tweaks

---
 GL/draw.c     | 13 ++-----------
 GL/lighting.c | 13 ++++---------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/GL/draw.c b/GL/draw.c
index 2eaf0c3..5cb9a5a 100644
--- a/GL/draw.c
+++ b/GL/draw.c
@@ -121,12 +121,7 @@ GL_FORCE_INLINE float clamp(float d, float min, float max) {
 }
 
 static void _readVertexData3f3f(const GLubyte* in, GLubyte* out) {
-    const float* input = (const float*) in;
-    float* output = (float*) out;
-
-    output[0] = input[0];
-    output[1] = input[1];
-    output[2] = input[2];
+    memcpy(out, in, sizeof(float) * 12);
 }
 
 // 10:10:10:2REV format
@@ -182,11 +177,7 @@ static void _readVertexData3ub3f(const GLubyte* input, GLubyte* out) {
 }
 
 static void _readVertexData2f2f(const GLubyte* in, GLubyte* out) {
-    const float* input = (const float*) in;
-    float* output = (float*) out;
-
-    output[0] = input[0];
-    output[1] = input[1];
+    memcpy(out, in, sizeof(float) * 2);
 }
 
 static void _readVertexData2f3f(const GLubyte* in, GLubyte* out) {
diff --git a/GL/lighting.c b/GL/lighting.c
index dfadb94..f6dd20b 100644
--- a/GL/lighting.c
+++ b/GL/lighting.c
@@ -404,8 +404,8 @@ GL_FORCE_INLINE void _glLightVertexDirectional(
 
 #define _PROCESS_COMPONENT(T, X) \
     do { \
-        float F = MATH_fmac(LdotN, LIGHTS[lid].diffuseMaterial[X], LIGHTS[lid].ambientMaterial[X]); \
-        F += (FI * LIGHTS[lid].specularMaterial[X]); \
+        float F = (LdotN * LIGHTS[lid].diffuseMaterial[X] + LIGHTS[lid].ambientMaterial[X]) \
+            + (FI * LIGHTS[lid].specularMaterial[X]); \
         uint8_t FO = (uint8_t) (_MIN(F * 255.0f, 255.0f)); \
         final[T] += _MIN(FO, 255 - final[T]); \
     } while(0);
@@ -426,8 +426,8 @@ GL_FORCE_INLINE void _glLightVertexPoint(
 
 #define _PROCESS_COMPONENT(T, X) \
     do { \
-        float F = MATH_fmac(LdotN, LIGHTS[lid].diffuseMaterial[X], LIGHTS[lid].ambientMaterial[X]); \
-        F += (FI * LIGHTS[lid].specularMaterial[X]); \
+        float F = (LdotN * LIGHTS[lid].diffuseMaterial[X] + LIGHTS[lid].ambientMaterial[X]) \
+            + (FI * LIGHTS[lid].specularMaterial[X]); \
         uint8_t FO = (uint8_t) (_MIN(F * att * 255.0f, 255.0f)); \
         final[T] += _MIN(FO, 255 - final[T]); \
     } while(0); \
@@ -460,9 +460,6 @@ void _glPerformLighting(Vertex* vertices, const EyeSpaceData* es, const int32_t
     float vdiffuse[4];
 
     for(j = 0; j < count; ++j, ++vertex, ++data) {
-        __builtin_prefetch(vertex + 1, 1, 1);
-        __builtin_prefetch(data + 1, 0, 1);
-
         /* Unpack the colour for use in glColorMaterial */
         bgra_to_float(vertex->bgra, vdiffuse);
         _glUpdateColourMaterial(vdiffuse);
@@ -481,8 +478,6 @@ void _glPerformLighting(Vertex* vertices, const EyeSpaceData* es, const int32_t
         const float Nz = data->n[2];
 
         for(i = 0; i < MAX_LIGHTS; ++i) {
-            __builtin_prefetch(LIGHTS + i + 1, 0, 1);
-
             if(!LIGHTS[i].isEnabled) continue;
 
             if(LIGHTS[i].isDirectional) {