From 9aac55317daee3e81247cd198c7eb1eb04314772 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 7 Jan 2022 22:42:52 +0100 Subject: [PATCH] Remove QueueDrawLines from GL, GLES, GLES2 --- src/render/opengl/SDL_render_gl.c | 54 +-------------- src/render/opengles/SDL_render_gles.c | 53 +------------- src/render/opengles2/SDL_render_gles2.c | 91 +------------------------ 3 files changed, 4 insertions(+), 194 deletions(-) diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c index 3b3d739f6..624329995 100644 --- a/src/render/opengl/SDL_render_gl.c +++ b/src/render/opengl/SDL_render_gl.c @@ -941,47 +941,6 @@ GL_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FP return 0; } -static int -GL_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FPoint * points, int count) -{ - int i; - GLfloat prevx, prevy; - const size_t vertlen = (sizeof (GLfloat) * 2) * count; - GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, vertlen, 0, &cmd->data.draw.first); - - if (!verts) { - return -1; - } - cmd->data.draw.count = count; - - /* 0.5f offset to hit the center of the pixel. */ - prevx = 0.5f + points->x; - prevy = 0.5f + points->y; - *(verts++) = prevx; - *(verts++) = prevy; - - /* bump the end of each line segment out a quarter of a pixel, to provoke - the diamond-exit rule. Without this, you won't just drop the last - pixel of the last line segment, but you might also drop pixels at the - edge of any given line segment along the way too. */ - for (i = 1; i < count; i++) { - const GLfloat xstart = prevx; - const GLfloat ystart = prevy; - const GLfloat xend = points[i].x + 0.5f; /* 0.5f to hit pixel center. */ - const GLfloat yend = points[i].y + 0.5f; - /* bump a little in the direction we are moving in. */ - const GLfloat deltax = xend - xstart; - const GLfloat deltay = yend - ystart; - const GLfloat angle = SDL_atan2f(deltay, deltax); - prevx = xend + (SDL_cosf(angle) * 0.25f); - prevy = yend + (SDL_sinf(angle) * 0.25f); - *(verts++) = prevx; - *(verts++) = prevy; - } - - return 0; -} - static int GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture, const float *xy, int xy_stride, const SDL_Color *color, int color_stride, const float *uv, int uv_stride, @@ -1111,7 +1070,6 @@ SetDrawState(GL_RenderData *data, const SDL_RenderCommand *cmd, const GL_Shader } vertex_array = cmd->command == SDL_RENDERCMD_DRAW_POINTS - || cmd->command == SDL_RENDERCMD_DRAW_LINES || cmd->command == SDL_RENDERCMD_GEOMETRY; color_array = cmd->command == SDL_RENDERCMD_GEOMETRY; texture_array = cmd->data.draw.texture != NULL; @@ -1286,17 +1244,8 @@ GL_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic break; } - case SDL_RENDERCMD_DRAW_LINES: { - const GLfloat *verts = (GLfloat *) (((Uint8 *) vertices) + cmd->data.draw.first); - const size_t count = cmd->data.draw.count; - SDL_assert(count >= 2); - SetDrawState(data, cmd, SHADER_SOLID); - - /* SetDrawState handles glEnableClientState. */ - data->glVertexPointer(2, GL_FLOAT, sizeof(float) * 2, verts); - data->glDrawArrays(GL_LINE_STRIP, 0, (GLsizei) count); + case SDL_RENDERCMD_DRAW_LINES: /* unused */ break; - } case SDL_RENDERCMD_FILL_RECTS: /* unused */ break; @@ -1694,7 +1643,6 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->QueueSetViewport = GL_QueueSetViewport; renderer->QueueSetDrawColor = GL_QueueSetViewport; /* SetViewport and SetDrawColor are (currently) no-ops. */ renderer->QueueDrawPoints = GL_QueueDrawPoints; - renderer->QueueDrawLines = GL_QueueDrawLines; renderer->QueueGeometry = GL_QueueGeometry; renderer->RunCommandQueue = GL_RunCommandQueue; renderer->RenderReadPixels = GL_RenderReadPixels; diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c index a6b58f2d7..21a3150d1 100644 --- a/src/render/opengles/SDL_render_gles.c +++ b/src/render/opengles/SDL_render_gles.c @@ -560,47 +560,6 @@ GLES_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_ return 0; } -static int -GLES_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FPoint * points, int count) -{ - int i; - GLfloat prevx, prevy; - const size_t vertlen = (sizeof (GLfloat) * 2) * count; - GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, vertlen, 0, &cmd->data.draw.first); - - if (!verts) { - return -1; - } - cmd->data.draw.count = count; - - /* 0.5f offset to hit the center of the pixel. */ - prevx = 0.5f + points->x; - prevy = 0.5f + points->y; - *(verts++) = prevx; - *(verts++) = prevy; - - /* bump the end of each line segment out a quarter of a pixel, to provoke - the diamond-exit rule. Without this, you won't just drop the last - pixel of the last line segment, but you might also drop pixels at the - edge of any given line segment along the way too. */ - for (i = 1; i < count; i++) { - const GLfloat xstart = prevx; - const GLfloat ystart = prevy; - const GLfloat xend = points[i].x + 0.5f; /* 0.5f to hit pixel center. */ - const GLfloat yend = points[i].y + 0.5f; - /* bump a little in the direction we are moving in. */ - const GLfloat deltax = xend - xstart; - const GLfloat deltay = yend - ystart; - const GLfloat angle = SDL_atan2f(deltay, deltax); - prevx = xend + (SDL_cosf(angle) * 0.25f); - prevy = yend + (SDL_sinf(angle) * 0.25f); - *(verts++) = prevx; - *(verts++) = prevy; - } - - return 0; -} - static int GLES_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture, const float *xy, int xy_stride, const SDL_Color *color, int color_stride, const float *uv, int uv_stride, @@ -850,15 +809,8 @@ GLES_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vert break; } - case SDL_RENDERCMD_DRAW_LINES: { - const GLfloat *verts = (GLfloat *) (((Uint8 *) vertices) + cmd->data.draw.first); - const size_t count = cmd->data.draw.count; - SDL_assert(count >= 2); - SetDrawState(data, cmd); - data->glVertexPointer(2, GL_FLOAT, 0, verts); - data->glDrawArrays(GL_LINE_STRIP, 0, (GLsizei) count); - break; - } + case SDL_RENDERCMD_DRAW_LINES: /* unused */ + break; case SDL_RENDERCMD_FILL_RECTS: /* unused */ break; @@ -1122,7 +1074,6 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->QueueSetViewport = GLES_QueueSetViewport; renderer->QueueSetDrawColor = GLES_QueueSetViewport; /* SetViewport and SetDrawColor are (currently) no-ops. */ renderer->QueueDrawPoints = GLES_QueueDrawPoints; - renderer->QueueDrawLines = GLES_QueueDrawLines; renderer->QueueGeometry = GLES_QueueGeometry; renderer->RunCommandQueue = GLES_RunCommandQueue; renderer->RenderReadPixels = GLES_RenderReadPixels; diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c index 3011c2e12..cbd99c54c 100644 --- a/src/render/opengles2/SDL_render_gles2.c +++ b/src/render/opengles2/SDL_render_gles2.c @@ -692,63 +692,6 @@ GLES2_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL return 0; } -static int -GLES2_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FPoint * points, int count) -{ - const SDL_bool colorswap = (renderer->target && (renderer->target->format == SDL_PIXELFORMAT_ARGB8888 || renderer->target->format == SDL_PIXELFORMAT_RGB888)); - int i; - GLfloat prevx, prevy; - SDL_VertexSolid *verts = (SDL_VertexSolid *) SDL_AllocateRenderVertices(renderer, count * sizeof(*verts), 0, &cmd->data.draw.first); - SDL_Color color; - color.r = cmd->data.draw.r; - color.g = cmd->data.draw.g; - color.b = cmd->data.draw.b; - color.a = cmd->data.draw.a; - - if (!verts) { - return -1; - } - - if (colorswap) { - Uint8 r = color.r; - color.r = color.b; - color.b = r; - } - - cmd->data.draw.count = count; - - /* 0.5f offset to hit the center of the pixel. */ - prevx = 0.5f + points->x; - prevy = 0.5f + points->y; - verts->position.x = prevx; - verts->position.y = prevy; - verts->color = color; - verts++; - - /* bump the end of each line segment out a quarter of a pixel, to provoke - the diamond-exit rule. Without this, you won't just drop the last - pixel of the last line segment, but you might also drop pixels at the - edge of any given line segment along the way too. */ - for (i = 1; i < count; i++) { - const GLfloat xstart = prevx; - const GLfloat ystart = prevy; - const GLfloat xend = points[i].x + 0.5f; /* 0.5f to hit pixel center. */ - const GLfloat yend = points[i].y + 0.5f; - /* bump a little in the direction we are moving in. */ - const GLfloat deltax = xend - xstart; - const GLfloat deltay = yend - ystart; - const GLfloat angle = SDL_atan2f(deltay, deltax); - prevx = xend + (SDL_cosf(angle) * 0.25f); - prevy = yend + (SDL_sinf(angle) * 0.25f); - verts->position.x = prevx; - verts->position.y = prevy; - verts->color = color; - verts++; - } - - return 0; -} - static int GLES2_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture, const float *xy, int xy_stride, const SDL_Color *color, int color_stride, const float *uv, int uv_stride, @@ -1183,39 +1126,8 @@ GLES2_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *ver case SDL_RENDERCMD_COPY_EX: /* unused */ break; - case SDL_RENDERCMD_DRAW_LINES: { - if (SetDrawState(data, cmd, GLES2_IMAGESOURCE_SOLID) == 0) { - size_t count = cmd->data.draw.count; - if (count > 2) { - /* joined lines cannot be grouped */ - data->glDrawArrays(GL_LINE_STRIP, 0, (GLsizei)count); - } else { - /* let's group non joined lines */ - SDL_RenderCommand *finalcmd = cmd; - SDL_RenderCommand *nextcmd = cmd->next; - SDL_BlendMode thisblend = cmd->data.draw.blend; - - while (nextcmd != NULL) { - const SDL_RenderCommandType nextcmdtype = nextcmd->command; - if (nextcmdtype != SDL_RENDERCMD_DRAW_LINES) { - break; /* can't go any further on this draw call, different render command up next. */ - } else if (nextcmd->data.draw.count != 2) { - break; /* can't go any further on this draw call, those are joined lines */ - } else if (nextcmd->data.draw.blend != thisblend) { - break; /* can't go any further on this draw call, different blendmode copy up next. */ - } else { - finalcmd = nextcmd; /* we can combine copy operations here. Mark this one as the furthest okay command. */ - count += cmd->data.draw.count; - } - nextcmd = nextcmd->next; - } - - data->glDrawArrays(GL_LINES, 0, (GLsizei)count); - cmd = finalcmd; /* skip any copy commands we just combined in here. */ - } - } + case SDL_RENDERCMD_DRAW_LINES: /* unused */ break; - } case SDL_RENDERCMD_DRAW_POINTS: case SDL_RENDERCMD_GEOMETRY: { @@ -2095,7 +2007,6 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags) renderer->QueueSetViewport = GLES2_QueueSetViewport; renderer->QueueSetDrawColor = GLES2_QueueSetViewport; /* SetViewport and SetDrawColor are (currently) no-ops. */ renderer->QueueDrawPoints = GLES2_QueueDrawPoints; - renderer->QueueDrawLines = GLES2_QueueDrawLines; renderer->QueueGeometry = GLES2_QueueGeometry; renderer->RunCommandQueue = GLES2_RunCommandQueue; renderer->RenderReadPixels = GLES2_RenderReadPixels;