Commit f02ad2820fa938202f524e9d63605983d29dc71a
2021-09-25T11:31:18
Remove FillRects from back-end, where RenderGeometry can be used
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 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416
diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
index 6fea41c..27950c1 100644
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -832,52 +832,6 @@ D3D_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_F
}
static int
-D3D_QueueFillRects(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FRect * rects, int count)
-{
- const DWORD color = D3DCOLOR_ARGB(cmd->data.draw.a, cmd->data.draw.r, cmd->data.draw.g, cmd->data.draw.b);
- const size_t vertslen = count * sizeof (Vertex) * 4;
- Vertex *verts = (Vertex *) SDL_AllocateRenderVertices(renderer, vertslen, 0, &cmd->data.draw.first);
- int i;
-
- if (!verts) {
- return -1;
- }
-
- SDL_memset(verts, '\0', vertslen);
- cmd->data.draw.count = count;
-
- for (i = 0; i < count; i++) {
- const SDL_FRect *rect = &rects[i];
- const float minx = rect->x;
- const float maxx = rect->x + rect->w;
- const float miny = rect->y;
- const float maxy = rect->y + rect->h;
-
- verts->x = minx;
- verts->y = miny;
- verts->color = color;
- verts++;
-
- verts->x = maxx;
- verts->y = miny;
- verts->color = color;
- verts++;
-
- verts->x = maxx;
- verts->y = maxy;
- verts->color = color;
- verts++;
-
- verts->x = minx;
- verts->y = maxy;
- verts->color = color;
- verts++;
- }
-
- return 0;
-}
-
-static int
D3D_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture,
const float *xy, int xy_stride, const int *color, int color_stride, const float *uv, int uv_stride,
int num_vertices, const void *indices, int num_indices, int size_indices,
@@ -1277,23 +1231,8 @@ D3D_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *verti
break;
}
- case SDL_RENDERCMD_FILL_RECTS: {
- const size_t count = cmd->data.draw.count;
- const size_t first = cmd->data.draw.first;
- SetDrawState(data, cmd);
- if (vbo) {
- size_t offset = 0;
- for (i = 0; i < count; ++i, offset += 4) {
- IDirect3DDevice9_DrawPrimitive(data->device, D3DPT_TRIANGLEFAN, (UINT) ((first / sizeof (Vertex)) + offset), 2);
- }
- } else {
- const Vertex *verts = (Vertex *) (((Uint8 *) vertices) + first);
- for (i = 0; i < count; ++i, verts += 4) {
- IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_TRIANGLEFAN, 2, verts, sizeof (Vertex));
- }
- }
+ case SDL_RENDERCMD_FILL_RECTS: /* unused */
break;
- }
case SDL_RENDERCMD_COPY: /* unused */
break;
@@ -1622,7 +1561,6 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->QueueSetDrawColor = D3D_QueueSetViewport; /* SetViewport and SetDrawColor are (currently) no-ops. */
renderer->QueueDrawPoints = D3D_QueueDrawPoints;
renderer->QueueDrawLines = D3D_QueueDrawPoints; /* lines and points queue vertices the same way. */
- renderer->QueueFillRects = D3D_QueueFillRects;
renderer->QueueGeometry = D3D_QueueGeometry;
renderer->RunCommandQueue = D3D_RunCommandQueue;
renderer->RenderReadPixels = D3D_RenderReadPixels;
diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
index 5aa8829..88824e4 100644
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -1634,71 +1634,6 @@ D3D11_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL
}
static int
-D3D11_QueueFillRects(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FRect * rects, int count)
-{
- VertexPositionColor *verts = (VertexPositionColor *) SDL_AllocateRenderVertices(renderer, count * 4 * sizeof (VertexPositionColor), 0, &cmd->data.draw.first);
- const float r = (float)(cmd->data.draw.r / 255.0f);
- const float g = (float)(cmd->data.draw.g / 255.0f);
- const float b = (float)(cmd->data.draw.b / 255.0f);
- const float a = (float)(cmd->data.draw.a / 255.0f);
- int i;
-
- if (!verts) {
- return -1;
- }
-
- cmd->data.draw.count = count;
-
- for (i = 0; i < count; i++) {
- verts->pos.x = rects[i].x;
- verts->pos.y = rects[i].y;
- verts->pos.z = 0.0f;
- verts->tex.x = 0.0f;
- verts->tex.y = 0.0f;
- verts->color.x = r;
- verts->color.y = g;
- verts->color.z = b;
- verts->color.w = a;
- verts++;
-
- verts->pos.x = rects[i].x;
- verts->pos.y = rects[i].y + rects[i].h;
- verts->pos.z = 0.0f;
- verts->tex.x = 0.0f;
- verts->tex.y = 0.0f;
- verts->color.x = r;
- verts->color.y = g;
- verts->color.z = b;
- verts->color.w = a;
- verts++;
-
- verts->pos.x = rects[i].x + rects[i].w;
- verts->pos.y = rects[i].y;
- verts->pos.z = 0.0f;
- verts->tex.x = 0.0f;
- verts->tex.y = 0.0f;
- verts->color.x = r;
- verts->color.y = g;
- verts->color.z = b;
- verts->color.w = a;
- verts++;
-
- verts->pos.x = rects[i].x + rects[i].w;
- verts->pos.y = rects[i].y + rects[i].h;
- verts->pos.z = 0.0f;
- verts->tex.x = 0.0f;
- verts->tex.y = 0.0f;
- verts->color.x = r;
- verts->color.y = g;
- verts->color.z = b;
- verts->color.w = a;
- verts++;
- }
-
- return 0;
-}
-
-static int
D3D11_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture,
const float *xy, int xy_stride, const int *color, int color_stride, const float *uv, int uv_stride,
int num_vertices, const void *indices, int num_indices, int size_indices,
@@ -2201,19 +2136,10 @@ D3D11_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *ver
break;
}
- case SDL_RENDERCMD_FILL_RECTS: {
- const size_t count = cmd->data.draw.count;
- const size_t first = cmd->data.draw.first;
- const size_t start = first / sizeof (VertexPositionColor);
- size_t offset = 0;
- D3D11_SetDrawState(renderer, cmd, rendererData->pixelShaders[SHADER_SOLID], 0, NULL, NULL, NULL);
- for (i = 0; i < count; i++, offset += 4) {
- D3D11_DrawPrimitives(renderer, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, start + offset, 4);
- }
+ case SDL_RENDERCMD_FILL_RECTS: /* unused */
break;
- }
- case SDL_RENDERCMD_COPY: /* unsued */
+ case SDL_RENDERCMD_COPY: /* unused */
break;
case SDL_RENDERCMD_COPY_EX: /* unused */
diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m
index eb9949a..1709fce 100644
--- a/src/render/metal/SDL_render_metal.m
+++ b/src/render/metal/SDL_render_metal.m
@@ -1146,52 +1146,6 @@ METAL_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_
}
static int
-METAL_QueueFillRects(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FRect * rects, int count)
-{
- const int color = (cmd->data.draw.r << 0) | (cmd->data.draw.g << 8) | (cmd->data.draw.b << 16) | (cmd->data.draw.a << 24);
- const size_t vertlen = 4 * (2 * sizeof (float) + sizeof (int)) * count;
- float *verts = (float *) SDL_AllocateRenderVertices(renderer, vertlen, DEVICE_ALIGN(8), &cmd->data.draw.first);
- if (!verts) {
- return -1;
- }
-
- cmd->data.draw.count = count;
-
- /* Quads in the following vertex order (matches the quad index buffer):
- * 1---3
- * | \ |
- * 0---2
- */
- for (int i = 0; i < count; i++, rects++) {
- if ((rects->w <= 0.0f) || (rects->h <= 0.0f)) {
- cmd->data.draw.count--;
- } else {
- *(verts++) = rects->x;
- *(verts++) = rects->y + rects->h;
- *((int *)verts++) = color;
-
- *(verts++) = rects->x;
- *(verts++) = rects->y;
- *((int *)verts++) = color;
-
- *(verts++) = rects->x + rects->w;
- *(verts++) = rects->y + rects->h;
- *((int *)verts++) = color;
-
- *(verts++) = rects->x + rects->w;
- *(verts++) = rects->y;
- *((int *)verts++) = color;
- }
- }
-
- if (cmd->data.draw.count == 0) {
- cmd->command = SDL_RENDERCMD_NO_OP; // nothing to do, just skip this one later.
- }
-
- return 0;
-}
-
-static int
METAL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture,
const float *xy, int xy_stride, const int *color, int color_stride, const float *uv, int uv_stride,
int num_vertices, const void *indices, int num_indices, int size_indices,
@@ -1459,33 +1413,13 @@ METAL_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *ver
break;
}
- case SDL_RENDERCMD_FILL_RECTS: {
- const size_t count = cmd->data.draw.count;
- const size_t maxcount = UINT16_MAX / 4;
- SetDrawState(renderer, cmd, SDL_METAL_FRAGMENT_SOLID, CONSTANTS_OFFSET_IDENTITY, mtlbufvertex, &statecache);
- if (count == 1) {
- [data.mtlcmdencoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];
- } else {
- /* Our index buffer has 16 bit indices, so we can only draw
- * 65k vertices (16k rects) at a time. */
- for (size_t i = 0; i < count; i += maxcount) {
- /* Set the vertex buffer offset for our current positions.
- * The vertex buffer itself was bound in SetDrawState. */
- [data.mtlcmdencoder setVertexBufferOffset:cmd->data.draw.first + i*sizeof(float)*8 atIndex:0];
- [data.mtlcmdencoder drawIndexedPrimitives:MTLPrimitiveTypeTriangle
- indexCount:SDL_min(maxcount, count - i) * 6
- indexType:MTLIndexTypeUInt16
- indexBuffer:data.mtlbufquadindices
- indexBufferOffset:0];
- }
- }
+ case SDL_RENDERCMD_FILL_RECTS: /* unused */
break;
- }
case SDL_RENDERCMD_COPY: /* unused */
break;
- case SDL_RENDERCMD_COPY_EX: /* unused */
+ case SDL_RENDERCMD_COPY_EX: /* unused */
break;
case SDL_RENDERCMD_GEOMETRY: {
@@ -1881,7 +1815,6 @@ METAL_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->QueueSetDrawColor = METAL_QueueSetDrawColor;
renderer->QueueDrawPoints = METAL_QueueDrawPoints;
renderer->QueueDrawLines = METAL_QueueDrawLines;
- renderer->QueueFillRects = METAL_QueueFillRects;
renderer->QueueGeometry = METAL_QueueGeometry;
renderer->RunCommandQueue = METAL_RunCommandQueue;
renderer->RenderReadPixels = METAL_RenderReadPixels;
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index 3b9b410..5fd290a 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -980,28 +980,6 @@ GL_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FPo
}
static int
-GL_QueueFillRects(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FRect * rects, int count)
-{
- GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, count * 4 * sizeof (GLfloat), 0, &cmd->data.draw.first);
- int i;
-
- if (!verts) {
- return -1;
- }
-
- cmd->data.draw.count = count;
- for (i = 0; i < count; i++) {
- const SDL_FRect *rect = &rects[i];
- *(verts++) = rect->x;
- *(verts++) = rect->y;
- *(verts++) = rect->x + rect->w;
- *(verts++) = rect->y + rect->h;
- }
-
- return 0;
-}
-
-static int
GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture,
const float *xy, int xy_stride, const int *color, int color_stride, const float *uv, int uv_stride,
int num_vertices, const void *indices, int num_indices, int size_indices,
@@ -1282,15 +1260,8 @@ GL_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
break;
}
- case SDL_RENDERCMD_FILL_RECTS: {
- const size_t count = cmd->data.draw.count;
- const GLfloat *verts = (GLfloat *) (((Uint8 *) vertices) + cmd->data.draw.first);
- SetDrawState(data, cmd, SHADER_SOLID);
- for (i = 0; i < count; ++i, verts += 4) {
- data->glRectf(verts[0], verts[1], verts[2], verts[3]);
- }
+ case SDL_RENDERCMD_FILL_RECTS: /* unused */
break;
- }
case SDL_RENDERCMD_COPY: /* unused */
break;
@@ -1676,7 +1647,6 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->QueueSetDrawColor = GL_QueueSetViewport; /* SetViewport and SetDrawColor are (currently) no-ops. */
renderer->QueueDrawPoints = GL_QueueDrawPoints;
renderer->QueueDrawLines = GL_QueueDrawLines;
- renderer->QueueFillRects = GL_QueueFillRects;
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 cb06e13..07ed445 100644
--- a/src/render/opengles/SDL_render_gles.c
+++ b/src/render/opengles/SDL_render_gles.c
@@ -602,37 +602,6 @@ GLES_QueueDrawLines(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_F
}
static int
-GLES_QueueFillRects(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FRect * rects, int count)
-{
- GLfloat *verts = (GLfloat *) SDL_AllocateRenderVertices(renderer, count * 8 * sizeof (GLfloat), 0, &cmd->data.draw.first);
- int i;
-
- if (!verts) {
- return -1;
- }
-
- cmd->data.draw.count = count;
-
- for (i = 0; i < count; i++) {
- const SDL_FRect *rect = &rects[i];
- const GLfloat minx = rect->x;
- const GLfloat maxx = rect->x + rect->w;
- const GLfloat miny = rect->y;
- const GLfloat maxy = rect->y + rect->h;
- *(verts++) = minx;
- *(verts++) = miny;
- *(verts++) = maxx;
- *(verts++) = miny;
- *(verts++) = minx;
- *(verts++) = maxy;
- *(verts++) = maxx;
- *(verts++) = maxy;
- }
-
- return 0;
-}
-
-static int
GLES_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture,
const float *xy, int xy_stride, const int *color, int color_stride, const float *uv, int uv_stride,
int num_vertices, const void *indices, int num_indices, int size_indices,
@@ -892,17 +861,8 @@ GLES_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vert
break;
}
- case SDL_RENDERCMD_FILL_RECTS: {
- const size_t count = cmd->data.draw.count;
- const GLfloat *verts = (GLfloat *) (((Uint8 *) vertices) + cmd->data.draw.first);
- GLsizei offset = 0;
- SetDrawState(data, cmd);
- data->glVertexPointer(2, GL_FLOAT, 0, verts);
- for (i = 0; i < count; ++i, offset += 4) {
- data->glDrawArrays(GL_TRIANGLE_STRIP, offset, 4);
- }
+ case SDL_RENDERCMD_FILL_RECTS: /* unused */
break;
- }
case SDL_RENDERCMD_COPY: /* unused */
break;
@@ -1164,7 +1124,6 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->QueueSetDrawColor = GLES_QueueSetViewport; /* SetViewport and SetDrawColor are (currently) no-ops. */
renderer->QueueDrawPoints = GLES_QueueDrawPoints;
renderer->QueueDrawLines = GLES_QueueDrawLines;
- renderer->QueueFillRects = GLES_QueueFillRects;
renderer->QueueGeometry = GLES_QueueGeometry;
renderer->RunCommandQueue = GLES_RunCommandQueue;
renderer->RenderReadPixels = GLES_RenderReadPixels;