From c8d3776447c5dcaf40b42c2de445c0aefd2ee7cd Mon Sep 17 00:00:00 2001
From: Tungstend <hanjinlong197@gmail.com>
Date: Mon, 31 Mar 2025 16:50:44 +0800
Subject: [PATCH] Misc(settings): rename unroll into basevertex

---
 src/main/cpp/config/settings.cpp | 6 +++---
 src/main/cpp/config/settings.h   | 2 +-
 src/main/cpp/gl/drawing.cpp      | 4 ++--
 src/main/cpp/gl/drawing.h        | 4 ++--
 src/main/cpp/glx/lookup.cpp      | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/cpp/config/settings.cpp b/src/main/cpp/config/settings.cpp
index de75127..a6e6e40 100644
--- a/src/main/cpp/config/settings.cpp
+++ b/src/main/cpp/config/settings.cpp
@@ -132,7 +132,7 @@ void init_settings() {
         case multidraw_mode_t::PreferIndirect:
             draw_mode_str = "Indirect";
             break;
-        case multidraw_mode_t::PreferUnroll:
+        case multidraw_mode_t::PreferBaseVertex:
             draw_mode_str = "Unroll";
             break;
         case multidraw_mode_t::PreferMultidrawIndirect:
@@ -169,10 +169,10 @@ void init_settings_post() {
             global_settings.multidraw_mode = multidraw_mode_t::PreferIndirect;
             LOG_V("    -> Indirect (OK)")
             break;
-        case multidraw_mode_t::PreferUnroll:
+        case multidraw_mode_t::PreferBaseVertex:
             LOG_V("multidrawMode = PreferUnroll")
             if (basevertex) {
-                global_settings.multidraw_mode = multidraw_mode_t::PreferUnroll;
+                global_settings.multidraw_mode = multidraw_mode_t::PreferBaseVertex;
                 LOG_V("    -> Unroll (OK)")
             } else if (multidraw) {
                 global_settings.multidraw_mode = multidraw_mode_t::PreferMultidrawIndirect;
diff --git a/src/main/cpp/config/settings.h b/src/main/cpp/config/settings.h
index 2f5f82c..3c6665b 100644
--- a/src/main/cpp/config/settings.h
+++ b/src/main/cpp/config/settings.h
@@ -14,7 +14,7 @@ extern "C" {
 enum class multidraw_mode_t: int {
     Auto = 0,
     PreferIndirect,
-    PreferUnroll,
+    PreferBaseVertex,
     PreferMultidrawIndirect
 };
 
diff --git a/src/main/cpp/gl/drawing.cpp b/src/main/cpp/gl/drawing.cpp
index 194b5ed..360b566 100644
--- a/src/main/cpp/gl/drawing.cpp
+++ b/src/main/cpp/gl/drawing.cpp
@@ -99,7 +99,7 @@ void mg_glMultiDrawElementsBaseVertex_multiindirect(GLenum mode, GLsizei* counts
     CHECK_GL_ERROR
 }
 
-void mg_glMultiDrawElementsBaseVertex_unroll(GLenum mode, GLsizei* counts, GLenum type, const void* const* indices, GLsizei primcount, const GLint* basevertex) {
+void mg_glMultiDrawElementsBaseVertex_basevertex(GLenum mode, GLsizei* counts, GLenum type, const void* const* indices, GLsizei primcount, const GLint* basevertex) {
     LOG()
 
     for (GLsizei i = 0; i < primcount; ++i) {
@@ -136,7 +136,7 @@ void mg_glMultiDrawElements_multiindirect(GLenum mode, const GLsizei *count, GLe
     CHECK_GL_ERROR
 }
 
-void mg_glMultiDrawElements_unroll(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount) {
+void mg_glMultiDrawElements_basevertex(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount) {
     LOG()
 
     for (GLsizei i = 0; i < primcount; ++i) {
diff --git a/src/main/cpp/gl/drawing.h b/src/main/cpp/gl/drawing.h
index 63a74af..30c169f 100644
--- a/src/main/cpp/gl/drawing.h
+++ b/src/main/cpp/gl/drawing.h
@@ -35,13 +35,13 @@ GLAPI GLAPIENTRY void mg_glMultiDrawElementsBaseVertex_indirect(GLenum mode, GLs
 
 GLAPI GLAPIENTRY void mg_glMultiDrawElementsBaseVertex_multiindirect(GLenum mode, GLsizei *counts, GLenum type, const void *const *indices, GLsizei primcount, const GLint *basevertex);
 
-GLAPI GLAPIENTRY void mg_glMultiDrawElementsBaseVertex_unroll(GLenum mode, GLsizei *counts, GLenum type, const void *const *indices, GLsizei primcount, const GLint *basevertex);
+GLAPI GLAPIENTRY void mg_glMultiDrawElementsBaseVertex_basevertex(GLenum mode, GLsizei *counts, GLenum type, const void *const *indices, GLsizei primcount, const GLint *basevertex);
 
 GLAPI GLAPIENTRY void mg_glMultiDrawElements_indirect(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount);
 
 GLAPI GLAPIENTRY void mg_glMultiDrawElements_multiindirect(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount);
 
-GLAPI GLAPIENTRY void mg_glMultiDrawElements_unroll(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount);
+GLAPI GLAPIENTRY void mg_glMultiDrawElements_basevertex(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount);
 
 GLAPI GLAPIENTRY void glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount);
 
diff --git a/src/main/cpp/glx/lookup.cpp b/src/main/cpp/glx/lookup.cpp
index ee3a5bf..17610b8 100644
--- a/src/main/cpp/glx/lookup.cpp
+++ b/src/main/cpp/glx/lookup.cpp
@@ -27,8 +27,8 @@ void* get_multidraw_func(const char* name) {
         case multidraw_mode_t::PreferIndirect:
             namestr += "_indirect";
             break;
-        case multidraw_mode_t::PreferUnroll:
-            namestr += "_unroll";
+        case multidraw_mode_t::PreferBaseVertex:
+            namestr += "_basevertex";
             break;
         case multidraw_mode_t::PreferMultidrawIndirect:
             namestr += "_multiindirect";