arrays: add one more function to reduce code duplication

mardy · Nov 14, 2024 · a46b37a · a46b37a
1 parent 61d639e
commit a46b37a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/src/arrays.cpp b/src/arrays.cpp
@@ -39,6 +39,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <variant>
 
 static char s_num_tex_arrays = 0;
+static bool s_has_normals = false;
+static uint8_t s_num_colors = 0;
+static uint8_t s_tex_unit_mask = 0;
 
 struct GxVertexFormat {
     uint8_t attribute;
@@ -465,6 +468,32 @@ void _ogx_arrays_setup_draw(bool has_normals, uint8_t num_colors,
             }
         }
     }
+
+    s_has_normals = has_normals;
+    s_num_colors = num_colors;
+    s_tex_unit_mask = tex_unit_mask;
+}
+
+void _ogx_arrays_process_element(int index)
+{
+    get_reader(&glparamstate.vertex_array)->process_element(index);
+
+    if (s_has_normals) {
+        get_reader(&glparamstate.normal_array)->process_element(index);
+    }
+
+    if (s_num_colors) {
+        get_reader(&glparamstate.color_array)->process_element(index);
+    }
+
+    if (s_tex_unit_mask) {
+        for (int i = 0; i < MAX_TEXTURE_UNITS; i++) {
+            if (s_tex_unit_mask & (1 << i)) {
+                get_reader(&glparamstate.texcoord_array[i])->
+                    process_element(index);
+            }
+        }
+    }
 }
 
 void _ogx_array_reader_enable_dup_color(OgxArrayReader *reader,

diff --git a/src/arrays.h b/src/arrays.h
@@ -50,6 +50,7 @@ void _ogx_array_reader_init(OgxArrayReader *reader,
                             int num_components, GLenum type, int stride);
 void _ogx_arrays_setup_draw(bool has_normals, uint8_t num_colors,
                             uint8_t tex_unit_mask);
+void _ogx_arrays_process_element(int index);
 void _ogx_array_reader_enable_dup_color(OgxArrayReader *reader,
                                         bool dup_color);
 void _ogx_array_reader_process_element(OgxArrayReader *reader, int index);

diff --git a/src/gc_gl.c b/src/gc_gl.c
@@ -2310,22 +2310,7 @@ static void draw_elements_general(DrawMode gxmode, int count, GLenum type,
     GX_Begin(gxmode.mode, GX_VTXFMT0, count + loop);
     for (int i = 0; i < count + loop; i++) {
         int index = read_index(indices, type, i % count);
-        _ogx_array_reader_process_element(&glparamstate.vertex_array, index);
-
-        if (ne) {
-            _ogx_array_reader_process_element(&glparamstate.normal_array, index);
-        }
-
-        if (color_provide) {
-            _ogx_array_reader_process_element(&glparamstate.color_array, index);
-        }
-
-        for (int tex = 0; tex < MAX_TEXTURE_UNITS; tex++) {
-            if (texen & (1 << tex)) {
-                _ogx_array_reader_process_element(
-                    &glparamstate.texcoord_array[tex], index);
-            }
-        }
+        _ogx_arrays_process_element(index);
     }
     GX_End();
 }
@@ -2487,22 +2472,7 @@ static void draw_arrays_general(DrawMode gxmode, int first, int count, int ne,
     int i;
     for (i = 0; i < count + loop; i++) {
         int j = i % count + first;
-        _ogx_array_reader_process_element(&glparamstate.vertex_array, j);
-
-        if (ne) {
-            _ogx_array_reader_process_element(&glparamstate.normal_array, j);
-        }
-
-        if (color_provide) {
-            _ogx_array_reader_process_element(&glparamstate.color_array, j);
-        }
-
-        for (int tex = 0; tex < MAX_TEXTURE_UNITS; tex++) {
-            if (texen & (1 << tex)) {
-                _ogx_array_reader_process_element(
-                    &glparamstate.texcoord_array[tex], j);
-            }
-        }
+        _ogx_arrays_process_element(j);
     }
     GX_End();
 }