Feat[basevertex]: add support for OES_draw_elements_base_vertex, EXT_draw_elements_base_vertex, EXT_multi_draw_indirect

Author: artdeell

ltw/src/main/tinywrapper/basevertex.c

@@ -18,8 +18,8 @@ typedef struct {
 
 void basevertex_init(context_t* context) {
     basevertex_renderer_t *renderer = &context->basevertex;
-    if(context->es32) {
-        printf("LTW: BaseVertex render calls will use OpenGL ES 3.2 variants\n");
+    if(context->drawelementsbasevertex != NULL) {
+        printf("LTW: BaseVertex render calls will use the host driver implementation\n");
         return;
     }
     if(!context->es31) {
@@ -50,8 +50,8 @@ static void restore_state(GLuint element_buffer) {
 
 void glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex) {
     if(!current_context) return;
-    if(current_context->es32) {
-        es3_functions.glDrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    if(current_context->drawelementsbasevertex != NULL) {
+        current_context->drawelementsbasevertex(mode, count, type, indices, basevertex);
         return;
     }
     basevertex_renderer_t *renderer = &current_context->basevertex;
@@ -89,9 +89,9 @@ void glMultiDrawElementsBaseVertex(GLenum mode,
                                    GLsizei drawcount,
                                    const GLint *basevertex) {
     if(!current_context) return;
-    if(current_context->es32) {
+    if(current_context->drawelementsbasevertex != NULL) {
         for(GLsizei i = 0; i < drawcount; i++) {
-            es3_functions.glDrawElementsBaseVertex(mode, count[i], type, indices[i], basevertex[i]);
+            current_context->drawelementsbasevertex(mode, count[i], type, indices[i], basevertex[i]);
         }
         return;
     }
@@ -121,7 +121,9 @@ void glMultiDrawElementsBaseVertex(GLenum mode,
     }
     es3_functions.glBindBuffer(GL_DRAW_INDIRECT_BUFFER, renderer->indirectRenderBuffer);
     es3_functions.glBufferData(GL_DRAW_INDIRECT_BUFFER, (long)sizeof(indirect_pass_t) * drawcount, indirect_passes, GL_STREAM_DRAW);
-    for(GLsizei i = 0; i < drawcount; i++) {
+    if(current_context->multidraw_indirect) {
+        es3_functions.glMultiDrawElementsIndirectEXT(mode, type, 0, drawcount, 0);
+    } else for(GLsizei i = 0; i < drawcount; i++) {
         es3_functions.glDrawElementsIndirect(mode, type, (void*)(sizeof(indirect_pass_t) * i));
     }
     restore_state(elementbuffer);

ltw/src/main/tinywrapper/egl.c

@@ -146,6 +146,14 @@ static void find_esversion(context_t* context) {
     const char* extensions = (const char*) es3_functions.glGetString(GL_EXTENSIONS);
     if(strstr(extensions, "GL_EXT_buffer_storage")) context->buffer_storage = true;
     if(strstr(extensions, "GL_EXT_texture_buffer")) context->buffer_texture_ext = true;
+    if(strstr(extensions, "GL_EXT_multi_draw_indirect")) context->multidraw_indirect = true;
+
+    bool basevertex_oes = strstr(extensions, "GL_OES_draw_elements_base_vertex");
+    bool basevertex_ext = strstr(extensions, "GL_EXT_draw_elements_base_vertex");
+    if(context->es32) context->drawelementsbasevertex = es3_functions.glDrawElementsBaseVertex;
+    else if(basevertex_oes) context->drawelementsbasevertex = es3_functions.glDrawElementsBaseVertexOES;
+    else if(basevertex_ext) context->drawelementsbasevertex = es3_functions.glDrawElementsBaseVertexEXT;
+    else context->drawelementsbasevertex = NULL;
 
     build_extension_string(context);
 

ltw/src/main/tinywrapper/egl.h

@@ -60,8 +60,8 @@ typedef struct {
 typedef struct {
     EGLContext phys_context;
     bool context_rdy;
-    bool es31, es32, buffer_storage, buffer_texture_ext;
-    bool force_depth32_fallback;
+    bool es31, es32, buffer_storage, buffer_texture_ext, multidraw_indirect;
+    PFNGLDRAWELEMENTSBASEVERTEXPROC drawelementsbasevertex;
     GLint shader_version;
     basevertex_renderer_t basevertex;
     GLuint multidraw_element_buffer;

ltw/src/main/tinywrapper/es3_extended.h

@@ -11,8 +11,11 @@ GLESFUNC(glMultiDrawElementsEXT,PFNGLMULTIDRAWELEMENTSEXTPROC)
 GLESFUNC(glGetTexLevelParameteriv,PFNGLGETTEXLEVELPARAMETERIVPROC)
 GLESFUNC(glGetTexLevelParameterfv,PFNGLGETTEXLEVELPARAMETERFVPROC)
 GLESFUNC(glDrawElementsBaseVertex, PFNGLDRAWELEMENTSBASEVERTEXPROC)
+GLESFUNC(glDrawElementsBaseVertexOES, PFNGLDRAWELEMENTSBASEVERTEXOESPROC)
+GLESFUNC(glDrawElementsBaseVertexEXT, PFNGLDRAWELEMENTSBASEVERTEXEXTPROC)
 GLESFUNC(glBufferStorageEXT, PFNGLBUFFERSTORAGEEXTPROC)
 GLESFUNC(glTexBuffer, PFNGLTEXBUFFERPROC);
 GLESFUNC(glTexBufferRange, PFNGLTEXBUFFERRANGEPROC);
 GLESFUNC(glTexBufferEXT, PFNGLTEXBUFFEREXTPROC)
-GLESFUNC(glTexBufferRangeEXT, PFNGLTEXBUFFERRANGEEXTPROC)
+GLESFUNC(glTexBufferRangeEXT, PFNGLTEXBUFFERRANGEEXTPROC)
+GLESFUNC(glMultiDrawElementsIndirectEXT, PFNGLMULTIDRAWELEMENTSINDIRECTEXTPROC)