this repo has no description
Removed index from GPU_RendererID. Removed GPU_GetRenderer(), which used that index. Renamed GPU_GetRendererByID() to GPU_GetRenderer().
+15
-49
+1
-9
include/SDL_gpu.h
+1
-9
include/SDL_gpu.h
···
94
94
GPU_RendererEnum renderer;
95
95
int major_version;
96
96
int minor_version;
97
-
98
-
int index;
99
97
} GPU_RendererID;
100
98
101
99
···
716
714
/*! Gets the first registered renderer identifier for the given enum value. */
717
715
DECLSPEC GPU_RendererID SDLCALL GPU_GetRendererID(GPU_RendererEnum renderer);
718
716
719
-
/*! Gets the renderer identifier for the given registration index. */
720
-
DECLSPEC GPU_RendererID SDLCALL GPU_GetRendererIDByIndex(unsigned int index);
721
-
722
717
/*! Gets the number of registered (available) renderers. */
723
718
DECLSPEC int SDLCALL GPU_GetNumRegisteredRenderers(void);
724
719
···
745
740
/*! Gets an array of identifiers for the active renderers. */
746
741
DECLSPEC void SDLCALL GPU_GetActiveRendererList(GPU_RendererID* renderers_array);
747
742
748
-
/*! Gets the renderer for the given renderer index. */
749
-
DECLSPEC GPU_Renderer* SDLCALL GPU_GetRenderer(unsigned int index);
750
-
751
743
/*! \return The renderer matching the given identifier. */
752
-
DECLSPEC GPU_Renderer* SDLCALL GPU_GetRendererByID(GPU_RendererID id);
744
+
DECLSPEC GPU_Renderer* SDLCALL GPU_GetRenderer(GPU_RendererID id);
753
745
754
746
/*! \return The current renderer */
755
747
DECLSPEC GPU_Renderer* SDLCALL GPU_GetCurrentRenderer(void);
+1
-2
src/SDL_gpu.c
+1
-2
src/SDL_gpu.c
···
62
62
63
63
void GPU_SetCurrentRenderer(GPU_RendererID id)
64
64
{
65
-
current_renderer = GPU_GetRendererByID(id);
65
+
current_renderer = GPU_GetRenderer(id);
66
66
67
67
if(current_renderer != NULL)
68
68
current_renderer->impl->SetAsCurrent(current_renderer);
···
677
677
r.renderer = renderer;
678
678
r.major_version = major_version;
679
679
r.minor_version = minor_version;
680
-
r.index = -1;
681
680
682
681
return r;
683
682
}
+13
-38
src/SDL_gpu_renderer.c
+13
-38
src/SDL_gpu_renderer.c
···
25
25
26
26
27
27
28
-
static GPU_RendererID makeRendererID(const char* name, GPU_RendererEnum renderer, int major_version, int minor_version, int index)
29
-
{
30
-
GPU_RendererID r;
31
-
r.name = name;
32
-
r.renderer = renderer;
33
-
r.major_version = major_version;
34
-
r.minor_version = minor_version;
35
-
r.index = index;
36
-
37
-
return r;
38
-
}
39
-
40
28
41
29
void GPU_InitRendererRegister(void);
42
30
···
129
117
return rendererRegister[i].id;
130
118
}
131
119
132
-
return makeRendererID("Unknown", GPU_RENDERER_UNKNOWN, 0, 0, -1);
133
-
}
134
-
135
-
GPU_RendererID GPU_GetRendererIDByIndex(unsigned int index)
136
-
{
137
-
if(index >= MAX_REGISTERED_RENDERERS)
138
-
return makeRendererID("Unknown", GPU_RENDERER_UNKNOWN, 0, 0, -1);
139
-
140
-
return rendererRegister[index].id;
120
+
return GPU_MakeRendererID("Unknown", GPU_RENDERER_UNKNOWN, 0, 0);
141
121
}
142
122
143
123
GPU_Renderer* GPU_CreateRenderer_OpenGL_1_BASE(GPU_RendererID request);
···
160
140
if(i >= MAX_REGISTERED_RENDERERS)
161
141
return;
162
142
163
-
id.index = i;
164
143
rendererRegister[i].id = id;
165
144
rendererRegister[i].createFn = create_renderer;
166
145
rendererRegister[i].freeFn = free_renderer;
···
224
203
{
225
204
rendererRegister[i].id.name = "Unknown";
226
205
rendererRegister[i].id.renderer = GPU_RENDERER_UNKNOWN;
227
-
rendererRegister[i].id.index = i;
228
206
rendererRegister[i].createFn = NULL;
229
207
rendererRegister[i].freeFn = NULL;
230
208
}
···
327
305
return result;
328
306
}
329
307
330
-
331
-
GPU_Renderer* GPU_GetRenderer(unsigned int index)
332
-
{
333
-
if(index >= MAX_ACTIVE_RENDERERS)
334
-
return NULL;
335
-
336
-
return rendererMap[index];
337
-
}
338
-
339
308
// Get a renderer from the map.
340
-
GPU_Renderer* GPU_GetRendererByID(GPU_RendererID id)
309
+
GPU_Renderer* GPU_GetRenderer(GPU_RendererID id)
341
310
{
311
+
int i;
342
312
GPU_InitRendererRegister();
343
313
344
-
if(id.index < 0)
345
-
return NULL;
314
+
for(i = 0; i < MAX_ACTIVE_RENDERERS; i++)
315
+
{
316
+
if(rendererMap[i] == NULL)
317
+
continue;
318
+
319
+
if(id.renderer == rendererMap[i]->id.renderer)
320
+
return rendererMap[i];
321
+
}
346
322
347
-
return GPU_GetRenderer(id.index);
323
+
return NULL;
348
324
}
349
325
350
326
// Create a new renderer based on a registered id and store it in the map.
···
365
341
366
342
// Add
367
343
rendererMap[i] = renderer;
368
-
renderer->id.index = i;
369
344
// Return
370
345
return renderer;
371
346
}
···
399
374
if(rendererMap[i] == NULL)
400
375
continue;
401
376
402
-
if(i == id.index && id.renderer == rendererMap[i]->id.renderer)
377
+
if(id.renderer == rendererMap[i]->id.renderer)
403
378
{
404
379
GPU_FreeRenderer(rendererMap[i]);
405
380
rendererMap[i] = NULL;