Commit 08797adaefbf516a5615eddc4dddd128b1bdd554
2021-09-19T00:39:28
opengles2: Attempt to batch RenderCopy calls into a single glDrawArrays call.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
index 11e89c6..e56f618 100644
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -788,7 +788,7 @@ GLES2_QueueCopy(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * t
int color;
GLfloat minx, miny, maxx, maxy;
GLfloat minu, maxu, minv, maxv;
- const size_t vertlen = 4 * (2 * sizeof (float) + sizeof (int) + 2 * sizeof (float));
+ const size_t vertlen = 6 * (2 * sizeof (float) + sizeof (int) + 2 * sizeof (float));
GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, vertlen, 0, &cmd->data.draw.first);
if (!verts) {
@@ -813,6 +813,10 @@ GLES2_QueueCopy(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * t
minv = (GLfloat) srcrect->y / texture->h;
maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
+ /* set these up as GL_TRIANGLES instead of GL_TRIANGLE_STRIP; it's more
+ vertices, but we can then draw unconnected pieces in a single draw
+ call if there are several draws in a row using the same texture
+ (such as a particle system or texture atlas). */
*(verts++) = minx;
*(verts++) = miny;
*((int *)verts++) = color;
@@ -831,6 +835,19 @@ GLES2_QueueCopy(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * t
*(verts++) = minu;
*(verts++) = maxv;
+
+ *(verts++) = maxx;
+ *(verts++) = miny;
+ *((int *)verts++) = color;
+ *(verts++) = maxu;
+ *(verts++) = minv;
+
+ *(verts++) = minx;
+ *(verts++) = maxy;
+ *((int *)verts++) = color;
+ *(verts++) = minu;
+ *(verts++) = maxv;
+
*(verts++) = maxx;
*(verts++) = maxy;
*((int *)verts++) = color;
@@ -855,7 +872,7 @@ GLES2_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture *
const GLfloat centery = center->y + dstrect->y;
GLfloat minx, miny, maxx, maxy;
GLfloat minu, maxu, minv, maxv;
- const size_t vertlen = 4 * (2 * sizeof (float) + sizeof (int) + (2 + 2 + 2) * sizeof (float));
+ const size_t vertlen = 6 * (2 * sizeof (float) + sizeof (int) + (2 + 2 + 2) * sizeof (float));
GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, vertlen, 0, &cmd->data.draw.first);
if (!verts) {
@@ -889,9 +906,13 @@ GLES2_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture *
minv = ((GLfloat) srcquad->y) / ((GLfloat) texture->h);
maxv = ((GLfloat) (srcquad->y + srcquad->h)) / ((GLfloat) texture->h);
-
cmd->data.draw.count = 1;
+ /* set these up as GL_TRIANGLES instead of GL_TRIANGLE_STRIP; it's more
+ vertices, but we can then draw unconnected pieces in a single draw
+ call if there are several draws in a row using the same texture
+ (such as a particle system or texture atlas). */
+
*(verts++) = minx;
*(verts++) = miny;
*((int *)verts++) = color;
@@ -923,6 +944,26 @@ GLES2_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture *
*(verts++) = centery;
*(verts++) = maxx;
+ *(verts++) = miny;
+ *((int *)verts++) = color;
+ *(verts++) = maxu;
+ *(verts++) = minv;
+ *(verts++) = s;
+ *(verts++) = c;
+ *(verts++) = centerx;
+ *(verts++) = centery;
+
+ *(verts++) = minx;
+ *(verts++) = maxy;
+ *((int *)verts++) = color;
+ *(verts++) = minu;
+ *(verts++) = maxv;
+ *(verts++) = s;
+ *(verts++) = c;
+ *(verts++) = centerx;
+ *(verts++) = centery;
+
+ *(verts++) = maxx;
*(verts++) = maxy;
*((int *)verts++) = color;
*(verts++) = maxu;
@@ -1375,9 +1416,34 @@ GLES2_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *ver
case SDL_RENDERCMD_COPY:
case SDL_RENDERCMD_COPY_EX: {
+ /* as long as we have the same copy command in a row, with the
+ same texture, we can combine them all into a single draw call. */
+ SDL_Texture *thistexture = cmd->data.draw.texture;
+ const SDL_RenderCommandType thiscmdtype = cmd->command;
+ SDL_RenderCommand *finalcmd = cmd;
+ SDL_RenderCommand *nextcmd = cmd->next;
+ int quads = 1;
+ while (nextcmd != NULL) {
+ const SDL_RenderCommandType nextcmdtype = nextcmd->command;
+ if (nextcmdtype != thiscmdtype) {
+ /* SETDRAWCOLOR commands are safe because copy color is set in the vbo per-vertex. */
+ if ((nextcmdtype != SDL_RENDERCMD_SETDRAWCOLOR) && (nextcmdtype != SDL_RENDERCMD_NO_OP)) {
+ break; /* can't go any further on this draw call, different render command up next. */
+ }
+ } else if (nextcmd->data.draw.texture != thistexture) {
+ break; /* can't go any further on this draw call, different texture copy up next. */
+ } else {
+ finalcmd = nextcmd; /* we can combine copy operations here. Mark this one as the furthest okay command. */
+ quads++;
+ }
+ nextcmd = nextcmd->next;
+ }
+
if (SetCopyState(renderer, cmd) == 0) {
- data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+ data->glDrawArrays(GL_TRIANGLES, 0, quads * 6);
}
+
+ cmd = finalcmd; /* skip any copy commands we just combined in here. */
break;
}