Commit 16beed9aeb77c3a161c9fc6be51cd214da890518
2021-09-24T17:09:04
Less code since color is constant when done with triangles
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
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index 3ca35d5..bab938e 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -904,7 +904,7 @@ void VerifyDrawQueueFunctions(const SDL_Renderer *renderer)
SDL_assert(renderer->QueueSetDrawColor != NULL);
SDL_assert(renderer->QueueDrawPoints != NULL);
SDL_assert(renderer->QueueDrawLines != NULL);
- SDL_assert(renderer->QueueFillRects != NULL);
+ SDL_assert(renderer->QueueFillRects != NULL || renderer->QueueGeometry != NULL);
SDL_assert(renderer->QueueCopy != NULL || renderer->QueueGeometry != NULL);
SDL_assert(renderer->RunCommandQueue != NULL);
}
@@ -3310,8 +3310,8 @@ SDL_RenderCopyF(SDL_Renderer * renderer, SDL_Texture * texture,
if (renderer->QueueGeometry && renderer->QueueCopy == NULL) {
float xy[8];
const int xy_stride = 2 * sizeof (float);
- SDL_Color col, color[4];
- const int color_stride = sizeof (SDL_Color);
+ SDL_Color color;
+ const int color_stride = 0;
float uv[8];
const int uv_stride = 2 * sizeof (float);
const int num_vertices = 4;
@@ -3321,13 +3321,8 @@ SDL_RenderCopyF(SDL_Renderer * renderer, SDL_Texture * texture,
float minu, minv, maxu, maxv;
float minx, miny, maxx, maxy;
- SDL_GetTextureColorMod(texture, &col.r, &col.g, &col.b);
- SDL_GetTextureAlphaMod(texture, &col.a);
-
- color[0] = col;
- color[1] = col;
- color[2] = col;
- color[3] = col;
+ SDL_GetTextureColorMod(texture, &color.r, &color.g, &color.b);
+ SDL_GetTextureAlphaMod(texture, &color.a);
minu = (float) (real_srcrect.x) / (float) texture->w;
minv = (float) (real_srcrect.y) / (float) texture->h;
@@ -3358,7 +3353,7 @@ SDL_RenderCopyF(SDL_Renderer * renderer, SDL_Texture * texture,
xy[7] = maxy;
retval = QueueCmdGeometry(renderer, texture,
- xy, xy_stride, (int *)color, color_stride, uv, uv_stride,
+ xy, xy_stride, (int *)&color, color_stride, uv, uv_stride,
num_vertices,
indices, num_indices, size_indices,
renderer->scale.x, renderer->scale.y);
@@ -3465,8 +3460,8 @@ SDL_RenderCopyExF(SDL_Renderer * renderer, SDL_Texture * texture,
if (renderer->QueueGeometry && renderer->QueueCopyEx == NULL) {
float xy[8];
const int xy_stride = 2 * sizeof (float);
- SDL_Color col, color[4];
- const int color_stride = sizeof (SDL_Color);
+ SDL_Color color;
+ const int color_stride = 0;
float uv[8];
const int uv_stride = 2 * sizeof (float);
const int num_vertices = 4;
@@ -3484,13 +3479,8 @@ SDL_RenderCopyExF(SDL_Renderer * renderer, SDL_Texture * texture,
const float s = SDL_sin(radian_angle);
const float c = SDL_cos(radian_angle);
- SDL_GetTextureColorMod(texture, &col.r, &col.g, &col.b);
- SDL_GetTextureAlphaMod(texture, &col.a);
-
- color[0] = col;
- color[1] = col;
- color[2] = col;
- color[3] = col;
+ SDL_GetTextureColorMod(texture, &color.r, &color.g, &color.b);
+ SDL_GetTextureAlphaMod(texture, &color.a);
minu = (float) (real_srcrect.x) / (float) texture->w;
minv = (float) (real_srcrect.y) / (float) texture->h;
@@ -3550,7 +3540,7 @@ SDL_RenderCopyExF(SDL_Renderer * renderer, SDL_Texture * texture,
xy[7] = (s_minx + c_maxy) + centery;
retval = QueueCmdGeometry(renderer, texture,
- xy, xy_stride, (int *)color, color_stride, uv, uv_stride,
+ xy, xy_stride, (int *)&color, color_stride, uv, uv_stride,
num_vertices,
indices, num_indices, size_indices,
renderer->scale.x, renderer->scale.y);