Commit a8f89a01aaec3c65e6e3587d48c484f5c6e4255f
2021-04-23T12:00:14
Change 'size_indice' to 'size_indices'
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
diff --git a/include/SDL_render.h b/include/SDL_render.h
index 056ce39..068efc9 100644
--- a/include/SDL_render.h
+++ b/include/SDL_render.h
@@ -1484,7 +1484,7 @@ extern DECLSPEC int SDLCALL SDL_RenderGeometry(SDL_Renderer *renderer,
* \param num_vertices Number of vertices.
* \param indices (optional) An array of indices into the 'vertices' arrays, if NULL all vertices will be rendered in sequential order.
* \param num_indices Number of indices.
- * \param size_indice Indice size: 1 (byte), 2 (short), 4 (int)
+ * \param size_indices Index size: 1 (byte), 2 (short), 4 (int)
*
* \return 0 on success, or -1 if the operation is not supported
*/
@@ -1494,7 +1494,7 @@ extern DECLSPEC int SDLCALL SDL_RenderGeometryRaw(SDL_Renderer *renderer,
const int *color, int color_stride,
const float *uv, int uv_stride,
int num_vertices,
- const void *indices, int num_indices, int size_indice);
+ const void *indices, int num_indices, int size_indices);
/**
* Read pixels from the current rendering target to an array of pixels.
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index 5640e94..172b7c8 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -579,7 +579,7 @@ QueueCmdGeometry(SDL_Renderer *renderer, SDL_Texture *texture,
const int *color, int color_stride,
const float *uv, int uv_stride,
int num_vertices,
- const void *indices, int num_indices, int size_indice,
+ const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y)
{
SDL_RenderCommand *cmd;
@@ -592,7 +592,7 @@ QueueCmdGeometry(SDL_Renderer *renderer, SDL_Texture *texture,
if (cmd != NULL) {
retval = renderer->QueueGeometry(renderer, cmd, texture,
xy, xy_stride, color, color_stride, uv, uv_stride,
- num_vertices, indices, num_indices, size_indice,
+ num_vertices, indices, num_indices, size_indices,
scale_x, scale_y);
if (retval < 0) {
cmd->command = SDL_RENDERCMD_NO_OP;
@@ -3356,9 +3356,9 @@ SDL_RenderGeometry(SDL_Renderer *renderer,
int color_stride = sizeof (SDL_Vertex);
const float *uv = (const float *)((const Uint8 *)vertices + SDL_OFFSETOF(SDL_Vertex, tex_coord));
int uv_stride = sizeof (SDL_Vertex);
- int size_indice = 4;
+ int size_indices = 4;
- return SDL_RenderGeometryRaw(renderer, texture, xy, xy_stride, color, color_stride, uv, uv_stride, num_vertices, indices, num_indices, size_indice);
+ return SDL_RenderGeometryRaw(renderer, texture, xy, xy_stride, color, color_stride, uv, uv_stride, num_vertices, indices, num_indices, size_indices);
}
#if SDL_HAVE_RENDER_GEOMETRY
@@ -3432,7 +3432,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
const int *color, int color_stride,
const float *uv, int uv_stride,
int num_vertices,
- const void *indices, int num_indices, int size_indice)
+ const void *indices, int num_indices, int size_indices)
{
int i;
int retval = 0;
@@ -3463,15 +3463,15 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
int C = -1; /* Third vertex of current triangle */
int C2 = -1; /* Last, vertex of previous triangle */
- if (size_indice == 4) {
+ if (size_indices == 4) {
k0 = ((const Uint32 *)indices)[i];
k1 = ((const Uint32 *)indices)[i + 1];
k2 = ((const Uint32 *)indices)[i + 2];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
k0 = ((const Uint16 *)indices)[i];
k1 = ((const Uint16 *)indices)[i + 1];
k2 = ((const Uint16 *)indices)[i + 2];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
k0 = ((const Uint8 *)indices)[i];
k1 = ((const Uint8 *)indices)[i + 1];
k2 = ((const Uint8 *)indices)[i + 2];
@@ -3708,7 +3708,7 @@ SDL_RenderGeometryRaw(SDL_Renderer *renderer,
const int *color, int color_stride,
const float *uv, int uv_stride,
int num_vertices,
- const void *indices, int num_indices, int size_indice)
+ const void *indices, int num_indices, int size_indices)
{
#if SDL_HAVE_RENDER_GEOMETRY
int i;
@@ -3746,11 +3746,11 @@ SDL_RenderGeometryRaw(SDL_Renderer *renderer,
}
if (indices) {
- if (size_indice != 1 && size_indice != 2 && size_indice != 4) {
- return SDL_InvalidParamError("size_indice");
+ if (size_indices != 1 && size_indice != 2 && size_indice != 4) {
+ return SDL_InvalidParamError("size_indices");
}
} else {
- size_indice = 0;
+ size_indices = 0;
}
/* Don't draw while we're hidden */
@@ -3780,9 +3780,9 @@ SDL_RenderGeometryRaw(SDL_Renderer *renderer,
if (indices) {
for (i = 0; i < num_indices; ++i) {
int j;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
} else {
j = ((const Uint8 *)indices)[i];
@@ -3801,13 +3801,13 @@ SDL_RenderGeometryRaw(SDL_Renderer *renderer,
if (renderer->info.flags & SDL_RENDERER_SOFTWARE) {
return SDL_SW_RenderGeometryRaw(renderer, texture,
xy, xy_stride, color, color_stride, uv, uv_stride, num_vertices,
- indices, num_indices, size_indice);
+ indices, num_indices, size_indices);
}
retval = QueueCmdGeometry(renderer, texture,
xy, xy_stride, color, color_stride, uv, uv_stride,
num_vertices,
- indices, num_indices, size_indice,
+ indices, num_indices, size_indices,
renderer->scale.x, renderer->scale.y);
return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
diff --git a/src/render/SDL_sysrender.h b/src/render/SDL_sysrender.h
index dca5440..f569b51 100644
--- a/src/render/SDL_sysrender.h
+++ b/src/render/SDL_sysrender.h
@@ -132,7 +132,7 @@ struct SDL_Renderer
#if SDL_HAVE_RENDER_GEOMETRY
int (*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_indice,
+ int num_vertices, const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y);
#endif
diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
index 27b661f..34fb485 100644
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -1024,7 +1024,7 @@ D3D_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * t
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_indice,
+ int num_vertices, const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y)
{
int i;
@@ -1041,11 +1041,11 @@ D3D_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *t
int j;
float *xy_;
SDL_Color col_;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
j = ((const Uint8 *)indices)[i];
} else {
j = i;
diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
index dfa2d12..436881b 100644
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -1869,7 +1869,7 @@ D3D11_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture *
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_indice,
+ int num_vertices, const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y)
{
int i;
@@ -1886,11 +1886,11 @@ D3D11_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
int j;
float *xy_;
SDL_Color col_;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
j = ((const Uint8 *)indices)[i];
} else {
j = i;
diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m
index 2e1dcad..48312c3 100644
--- a/src/render/metal/SDL_render_metal.m
+++ b/src/render/metal/SDL_render_metal.m
@@ -1322,7 +1322,7 @@ METAL_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture *
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_indice,
+ int num_vertices, const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y)
{
int count = indices ? num_indices : num_vertices;
@@ -1336,11 +1336,11 @@ METAL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
for (int i = 0; i < count; i++) {
int j;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
j = ((const Uint8 *)indices)[i];
} else {
j = i;
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index 387dac7..a845330 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -1055,7 +1055,7 @@ GL_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * te
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_indice,
+ int num_vertices, const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y)
{
GL_TextureData *texturedata = NULL;
@@ -1079,11 +1079,11 @@ GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
int j;
float *xy_;
SDL_Color col_;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
j = ((const Uint8 *)indices)[i];
} else {
j = i;
diff --git a/src/render/opengles/SDL_render_gles.c b/src/render/opengles/SDL_render_gles.c
index 1c42625..7ffc349 100644
--- a/src/render/opengles/SDL_render_gles.c
+++ b/src/render/opengles/SDL_render_gles.c
@@ -759,7 +759,7 @@ GLES_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture *
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_indice,
+ int num_vertices, const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y)
{
GLES_TextureData *texturedata = NULL;
@@ -783,11 +783,11 @@ GLES_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *
int j;
float *xy_;
SDL_Color col_;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
j = ((const Uint8 *)indices)[i];
} else {
j = i;
diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
index 4e43a50..ae57bcb 100644
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -941,7 +941,7 @@ GLES2_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture *
static int
GLES2_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_indice,
+ int num_vertices, const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y)
{
int i;
@@ -960,11 +960,11 @@ GLES2_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
int j;
float *xy_;
int col_;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
j = ((const Uint8 *)indices)[i];
} else {
j = i;
diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index bd09d5c..233b792 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -579,7 +579,7 @@ typedef struct GeometryCopyData
static int
SW_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_indice,
+ int num_vertices, const void *indices, int num_indices, int size_indices,
float scale_x, float scale_y)
{
int i;
@@ -601,11 +601,11 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
float *xy_;
SDL_Color col_;
float *uv_;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
j = ((const Uint8 *)indices)[i];
} else {
j = i;
@@ -634,11 +634,11 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
int j;
float *xy_;
SDL_Color col_;
- if (size_indice == 4) {
+ if (size_indices == 4) {
j = ((const Uint32 *)indices)[i];
- } else if (size_indice == 2) {
+ } else if (size_indices == 2) {
j = ((const Uint16 *)indices)[i];
- } else if (size_indice == 1) {
+ } else if (size_indices == 1) {
j = ((const Uint8 *)indices)[i];
} else {
j = i;