TheCloud/MobileGlues
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGlues.git synced 2025-09-22 10:42:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc(settings): rename unroll into basevertex

Browse Source
This commit is contained in:
Tungstend 2025-03-31 16:50:44 +08:00
parent eab666e44b
commit c8d3776447
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/cpp/config/settings.cpp
View File

@ -132,7 +132,7 @@ void init_settings() {
case multidraw_mode_t::PreferIndirect: case multidraw_mode_t::PreferIndirect:
draw_mode_str = "Indirect"; draw_mode_str = "Indirect";
break; break;
case multidraw_mode_t::PreferUnroll: case multidraw_mode_t::PreferBaseVertex:
draw_mode_str = "Unroll"; draw_mode_str = "Unroll";
break; break;
case multidraw_mode_t::PreferMultidrawIndirect: case multidraw_mode_t::PreferMultidrawIndirect:
@ -169,10 +169,10 @@ void init_settings_post() {
global_settings.multidraw_mode = multidraw_mode_t::PreferIndirect; global_settings.multidraw_mode = multidraw_mode_t::PreferIndirect;
LOG_V(" -> Indirect (OK)") LOG_V(" -> Indirect (OK)")
break; break;
case multidraw_mode_t::PreferUnroll: case multidraw_mode_t::PreferBaseVertex:
LOG_V("multidrawMode = PreferUnroll") LOG_V("multidrawMode = PreferUnroll")
if (basevertex) { if (basevertex) {
global_settings.multidraw_mode = multidraw_mode_t::PreferUnroll; global_settings.multidraw_mode = multidraw_mode_t::PreferBaseVertex;
LOG_V(" -> Unroll (OK)") LOG_V(" -> Unroll (OK)")
} else if (multidraw) { } else if (multidraw) {
global_settings.multidraw_mode = multidraw_mode_t::PreferMultidrawIndirect; global_settings.multidraw_mode = multidraw_mode_t::PreferMultidrawIndirect;

2
src/main/cpp/config/settings.h
View File

@ -14,7 +14,7 @@ extern "C" {
enum class multidraw_mode_t: int { enum class multidraw_mode_t: int {
Auto = 0, Auto = 0,
PreferIndirect, PreferIndirect,
PreferUnroll, PreferBaseVertex,
PreferMultidrawIndirect PreferMultidrawIndirect
}; };

4
src/main/cpp/gl/drawing.cpp
View File

@ -99,7 +99,7 @@ void mg_glMultiDrawElementsBaseVertex_multiindirect(GLenum mode, GLsizei* counts
CHECK_GL_ERROR 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() LOG()
for (GLsizei i = 0; i < primcount; ++i) { for (GLsizei i = 0; i < primcount; ++i) {
@ -136,7 +136,7 @@ void mg_glMultiDrawElements_multiindirect(GLenum mode, const GLsizei *count, GLe
CHECK_GL_ERROR 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() LOG()
for (GLsizei i = 0; i < primcount; ++i) { for (GLsizei i = 0; i < primcount; ++i) {

4
src/main/cpp/gl/drawing.h
View File

@ -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_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_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_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); GLAPI GLAPIENTRY void glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount);

4
src/main/cpp/glx/lookup.cpp
View File

@ -27,8 +27,8 @@ void* get_multidraw_func(const char* name) {
case multidraw_mode_t::PreferIndirect: case multidraw_mode_t::PreferIndirect:
namestr += "_indirect"; namestr += "_indirect";
break; break;
case multidraw_mode_t::PreferUnroll: case multidraw_mode_t::PreferBaseVertex:
namestr += "_unroll"; namestr += "_basevertex";
break; break;
case multidraw_mode_t::PreferMultidrawIndirect: case multidraw_mode_t::PreferMultidrawIndirect:
namestr += "_multiindirect"; namestr += "_multiindirect";