Skip to content

Commit b0d1cb8

Browse files
expikrexpikr
committed
Add SDL_RenderGeometryRawEx
1 parent eed94cb commit b0d1cb8

File tree

5 files changed

+102
-20
lines changed

5 files changed

+102
-20
lines changed

‎include/SDL3/SDL_render.h‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2294,6 +2294,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_RenderTexture9GridTiled(SDL_Renderer *rende
22942294
* \since This function is available since SDL 3.2.0.
22952295
*
22962296
* \sa SDL_RenderGeometryRaw
2297+
* \sa SDL_RenderGeometryRawEx
22972298
*/
22982299
extern SDL_DECLSPEC bool SDLCALL SDL_RenderGeometry(SDL_Renderer *renderer,
22992300
SDL_Texture *texture,
@@ -2326,6 +2327,7 @@ extern SDL_DECLSPEC bool SDLCALL SDL_RenderGeometry(SDL_Renderer *renderer,
23262327
* \since This function is available since SDL 3.2.0.
23272328
*
23282329
* \sa SDL_RenderGeometry
2330+
* \sa SDL_RenderGeometryRawEx
23292331
*/
23302332
extern SDL_DECLSPEC bool SDLCALL SDL_RenderGeometryRaw(SDL_Renderer *renderer,
23312333
SDL_Texture *texture,
@@ -2335,6 +2337,45 @@ extern SDL_DECLSPEC bool SDLCALL SDL_RenderGeometryRaw(SDL_Renderer *renderer,
23352337
int num_vertices,
23362338
const void *indices, int num_indices, int size_indices);
23372339

2340+
2341+
/**
2342+
* Render a list of triangles, optionally using a texture and indices into the
2343+
* vertex arrays which can have up to 4 positional coordinates.
2344+
* Color and alpha modulation is done per vertex.
2345+
* (SDL_SetTextureColorMod and SDL_SetTextureAlphaMod are ignored).
2346+
*
2347+
* \param renderer the rendering context.
2348+
* \param texture (optional) The SDL texture to use.
2349+
* \param pos vertex positions.
2350+
* \param pos_stride byte size to move from one element to the next element.
2351+
* \param pos_len how many vertext position coordinates, must be 2, 3, or 4.
2352+
* \param color vertex colors (as SDL_FColor).
2353+
* \param color_stride byte size to move from one element to the next element.
2354+
* \param uv vertex normalized texture coordinates.
2355+
* \param uv_stride byte size to move from one element to the next element.
2356+
* \param num_vertices number of vertices.
2357+
* \param indices (optional) An array of indices into the 'vertices' arrays,
2358+
* if NULL all vertices will be rendered in sequential order.
2359+
* \param num_indices number of indices.
2360+
* \param size_indices index size: 1 (byte), 2 (short), 4 (int).
2361+
* \returns true on success or false on failure; call SDL_GetError() for more
2362+
* information.
2363+
*
2364+
* \threadsafety This function should only be called on the main thread.
2365+
*
2366+
* \since This function is available since SDL 3.4.0.
2367+
*
2368+
* \sa SDL_RenderGeometry
2369+
* \sa SDL_RenderGeometryRaw
2370+
*/
2371+
extern SDL_DECLSPEC bool SDLCALL SDL_RenderGeometryRawEx(SDL_Renderer *renderer,
2372+
SDL_Texture *texture,
2373+
const float *pos, int pos_stride, Uint8 pos_len,
2374+
const SDL_FColor *color, int color_stride,
2375+
const float *uv, int uv_stride,
2376+
int num_vertices,
2377+
const void *indices, int num_indices, int size_indices);
2378+
23382379
/**
23392380
* Read pixels from the current rendering target.
23402381
*

‎src/render/SDL_render.c‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ static SDL_RenderCommand *PrepQueueCmdDraw(SDL_Renderer *renderer, const SDL_Ren
589589
if (renderer->gpu_render_state) {
590590
renderer->gpu_render_state->last_command_generation = renderer->render_command_generation;
591591
}
592+
cmd->data.draw.tentatively_named_rendergeometry_position_coordinate_count = 2;
592593
}
593594
}
594595
return cmd;
@@ -722,7 +723,7 @@ static bool QueueCmdCopyEx(SDL_Renderer *renderer, SDL_Texture *texture,
722723
}
723724

724725
static bool QueueCmdGeometry(SDL_Renderer *renderer, SDL_Texture *texture,
725-
const float *xy, int xy_stride,
726+
const float *pos, int pos_stride, Uint8 pos_len,
726727
const SDL_FColor *color, int color_stride,
727728
const float *uv, int uv_stride,
728729
int num_vertices,
@@ -734,8 +735,9 @@ static bool QueueCmdGeometry(SDL_Renderer *renderer, SDL_Texture *texture,
734735
cmd = PrepQueueCmdDraw(renderer, SDL_RENDERCMD_GEOMETRY, texture);
735736
if (cmd) {
736737
cmd->data.draw.texture_address_mode = texture_address_mode;
738+
cmd->data.draw.tentatively_named_rendergeometry_position_coordinate_count = pos_len;
737739
result = renderer->QueueGeometry(renderer, cmd, texture,
738-
xy, xy_stride,
740+
pos, pos_stride,
739741
color, color_stride, uv, uv_stride,
740742
num_vertices, indices, num_indices, size_indices,
741743
scale_x, scale_y);
@@ -3737,7 +3739,8 @@ bool SDL_RenderLines(SDL_Renderer *renderer, const SDL_FPoint *points, int count
37373739
}
37383740

37393741
result = QueueCmdGeometry(renderer, NULL,
3740-
xy, xy_stride, &renderer->color, 0 /* color_stride */, NULL, 0,
3742+
xy, xy_stride, 2,
3743+
&renderer->color, 0 /* color_stride */, NULL, 0,
37413744
num_vertices, indices, num_indices, size_indices,
37423745
1.0f, 1.0f, SDL_TEXTURE_ADDRESS_CLAMP);
37433746
}
@@ -3918,7 +3921,8 @@ static bool SDL_RenderTextureInternal(SDL_Renderer *renderer, SDL_Texture *textu
39183921
xy[7] = maxy;
39193922

39203923
result = QueueCmdGeometry(renderer, texture,
3921-
xy, xy_stride, &texture->color, 0 /* color_stride */, uv, uv_stride,
3924+
xy, xy_stride, 2,
3925+
&texture->color, 0 /* color_stride */, uv, uv_stride,
39223926
num_vertices, indices, num_indices, size_indices,
39233927
scale_x, scale_y, SDL_TEXTURE_ADDRESS_CLAMP);
39243928
} else {
@@ -4079,7 +4083,7 @@ bool SDL_RenderTextureAffine(SDL_Renderer *renderer, SDL_Texture *texture,
40794083

40804084
result = QueueCmdGeometry(
40814085
renderer, texture,
4082-
xy, xy_stride,
4086+
xy, xy_stride, 2,
40834087
&texture->color, 0 /* color_stride */,
40844088
uv, uv_stride,
40854089
num_vertices, indices, num_indices, size_indices,
@@ -4231,7 +4235,8 @@ bool SDL_RenderTextureRotated(SDL_Renderer *renderer, SDL_Texture *texture,
42314235
xy[7] = (s_minx + c_maxy) + centery;
42324236

42334237
result = QueueCmdGeometry(renderer, texture,
4234-
xy, xy_stride, &texture->color, 0 /* color_stride */, uv, uv_stride,
4238+
xy, xy_stride, 2,
4239+
&texture->color, 0 /* color_stride */, uv, uv_stride,
42354240
num_vertices, indices, num_indices, size_indices,
42364241
scale_x, scale_y, SDL_TEXTURE_ADDRESS_CLAMP);
42374242
} else {
@@ -4283,7 +4288,8 @@ static bool SDL_RenderTextureTiled_Wrap(SDL_Renderer *renderer, SDL_Texture *tex
42834288

42844289
const SDL_RenderViewState *view = renderer->view;
42854290
return QueueCmdGeometry(renderer, texture,
4286-
xy, xy_stride, &texture->color, 0 /* color_stride */, uv, uv_stride,
4291+
xy, xy_stride, 2,
4292+
&texture->color, 0 /* color_stride */, uv, uv_stride,
42874293
num_vertices, indices, num_indices, size_indices,
42884294
view->current_scale.x, view->current_scale.y, SDL_TEXTURE_ADDRESS_WRAP);
42894295
}
@@ -5030,7 +5036,8 @@ static bool SDLCALL SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
50305036
SDL_Log("Triangle %d %d %d - is_uniform:%d is_rectangle:%d", prev[0], prev[1], prev[2], is_uniform, is_rectangle);
50315037
#endif
50325038
result = QueueCmdGeometry(renderer, texture,
5033-
xy, xy_stride, color, color_stride, uv, uv_stride,
5039+
xy, xy_stride, 2,
5040+
color, color_stride, uv, uv_stride,
50345041
num_vertices, prev, 3, 4,
50355042
scale_x, scale_y, SDL_TEXTURE_ADDRESS_CLAMP);
50365043
if (!result) {
@@ -5050,7 +5057,8 @@ static bool SDLCALL SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
50505057
SDL_Log("Last triangle %d %d %d", prev[0], prev[1], prev[2]);
50515058
#endif
50525059
result = QueueCmdGeometry(renderer, texture,
5053-
xy, xy_stride, color, color_stride, uv, uv_stride,
5060+
xy, xy_stride, 2,
5061+
color, color_stride, uv, uv_stride,
50545062
num_vertices, prev, 3, 4,
50555063
scale_x, scale_y, SDL_TEXTURE_ADDRESS_CLAMP);
50565064
if (!result) {
@@ -5074,6 +5082,22 @@ bool SDL_RenderGeometryRaw(SDL_Renderer *renderer,
50745082
const float *uv, int uv_stride,
50755083
int num_vertices,
50765084
const void *indices, int num_indices, int size_indices)
5085+
{
5086+
return SDL_RenderGeometryRawEx(renderer, texture,
5087+
xy, xy_stride, 2,
5088+
color, color_stride,
5089+
uv, uv_stride,
5090+
num_vertices,
5091+
indices, num_indices, size_indices);
5092+
}
5093+
5094+
bool SDL_RenderGeometryRawEx(SDL_Renderer *renderer,
5095+
SDL_Texture *texture,
5096+
const float *xy, int xy_stride, Uint8 pos_len,
5097+
const SDL_FColor *color, int color_stride,
5098+
const float *uv, int uv_stride,
5099+
int num_vertices,
5100+
const void *indices, int num_indices, int size_indices)
50775101
{
50785102
int i;
50795103
int count = indices ? num_indices : num_vertices;
@@ -5177,7 +5201,8 @@ bool SDL_RenderGeometryRaw(SDL_Renderer *renderer,
51775201

51785202
const SDL_RenderViewState *view = renderer->view;
51795203
return QueueCmdGeometry(renderer, texture,
5180-
xy, xy_stride, color, color_stride, uv, uv_stride,
5204+
xy, xy_stride, pos_len,
5205+
color, color_stride, uv, uv_stride,
51815206
num_vertices, indices, num_indices, size_indices,
51825207
view->current_scale.x, view->current_scale.y,
51835208
texture_address_mode);

‎src/render/SDL_sysrender.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ typedef struct SDL_RenderCommand
189189
SDL_ScaleMode texture_scale_mode;
190190
SDL_TextureAddressMode texture_address_mode;
191191
SDL_GPURenderState *gpu_render_state;
192+
Uint8 tentatively_named_rendergeometry_position_coordinate_count;
192193
} draw;
193194
struct
194195
{

‎src/render/opengl/SDL_glfuncs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ SDL_PROC_UNUSED(void, glCullFace, (GLenum mode))
108108
SDL_PROC_UNUSED(void, glDeleteLists, (GLuint list, GLsizei range))
109109
SDL_PROC(void, glDeleteTextures, (GLsizei n, const GLuint *textures))
110110
SDL_PROC(void, glDepthFunc, (GLenum func))
111-
SDL_PROC_UNUSED(void, glDepthMask, (GLboolean flag))
111+
SDL_PROC(void, glDepthMask, (GLboolean flag))
112112
SDL_PROC_UNUSED(void, glDepthRange, (GLclampd zNear, GLclampd zFar))
113113
SDL_PROC(void, glDisable, (GLenum cap))
114114
SDL_PROC(void, glDisableClientState, (GLenum array))

‎src/render/opengl/SDL_render_gl.c‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -921,8 +921,9 @@ static bool GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL
921921
int i;
922922
int count = indices ? num_indices : num_vertices;
923923
GLfloat *verts;
924-
size_t sz = 2 * sizeof(GLfloat) + 4 * sizeof(GLfloat) + (texture ? 2 : 0) * sizeof(GLfloat);
924+
size_t sz = 4 * sizeof(GLfloat) + 4 * sizeof(GLfloat) + (texture ? 2 : 0) * sizeof(GLfloat);
925925
const float color_scale = cmd->data.draw.color_scale;
926+
Uint8 pos_len = cmd->data.draw.tentatively_named_rendergeometry_position_coordinate_count;
926927

927928
verts = (GLfloat *)SDL_AllocateRenderVertices(renderer, count * sz, 0, &cmd->data.draw.first);
928929
if (!verts) {
@@ -954,6 +955,8 @@ static bool GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL
954955

955956
*(verts++) = xy_[0] * scale_x;
956957
*(verts++) = xy_[1] * scale_y;
958+
*(verts++) = pos_len > 2 ? xy_[2] : 0;
959+
*(verts++) = pos_len > 3 ? xy_[3] : 1;
957960

958961
col_ = (SDL_FColor *)((char *)color + j * color_stride);
959962
*(verts++) = col_->r * color_scale;
@@ -976,6 +979,9 @@ static bool SetDrawState(GL_RenderData *data, const SDL_RenderCommand *cmd, cons
976979
bool vertex_array;
977980
bool color_array;
978981
bool texture_array;
982+
bool isCmdRenderGeometry = (cmd->command == SDL_RENDERCMD_GEOMETRY);
983+
bool isCmdDrawPoints = (cmd->command == SDL_RENDERCMD_DRAW_POINTS);
984+
bool isCmdDrawLines = (cmd->command == SDL_RENDERCMD_DRAW_LINES);
979985

980986
if (data->drawstate.viewport_dirty) {
981987
const bool istarget = data->drawstate.target != NULL;
@@ -1004,6 +1010,14 @@ static bool SetDrawState(GL_RenderData *data, const SDL_RenderCommand *cmd, cons
10041010
data->drawstate.cliprect_enabled_dirty = false;
10051011
}
10061012

1013+
if (isCmdRenderGeometry && cmd->data.draw.tentatively_named_rendergeometry_position_coordinate_count > 2) {
1014+
data->glEnable(GL_DEPTH_TEST);
1015+
data->glDepthMask(GL_TRUE);
1016+
} else {
1017+
data->glDisable(GL_DEPTH_TEST);
1018+
data->glDepthMask(GL_TRUE);
1019+
}
1020+
10071021
if (data->drawstate.cliprect_enabled && data->drawstate.cliprect_dirty) {
10081022
const SDL_Rect *viewport = &data->drawstate.viewport;
10091023
const SDL_Rect *rect = &data->drawstate.cliprect;
@@ -1045,8 +1059,8 @@ static bool SetDrawState(GL_RenderData *data, const SDL_RenderCommand *cmd, cons
10451059
data->drawstate.texturing_dirty = false;
10461060
}
10471061

1048-
vertex_array = cmd->command == SDL_RENDERCMD_DRAW_POINTS || cmd->command == SDL_RENDERCMD_DRAW_LINES || cmd->command == SDL_RENDERCMD_GEOMETRY;
1049-
color_array = cmd->command == SDL_RENDERCMD_GEOMETRY;
1062+
vertex_array = isCmdDrawPoints || isCmdDrawLine || isCmdRenderGeometry;
1063+
color_array = isCmdRenderGeometry;
10501064
texture_array = cmd->data.draw.texture != NULL;
10511065

10521066
if (vertex_array != data->drawstate.vertex_array) {
@@ -1345,7 +1359,7 @@ static bool GL_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *cmd, v
13451359
data->drawstate.cliprect_enabled_dirty = data->drawstate.cliprect_enabled;
13461360
}
13471361

1348-
data->glClear(GL_COLOR_BUFFER_BIT);
1362+
data->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
13491363
break;
13501364
}
13511365

@@ -1411,6 +1425,7 @@ static bool GL_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *cmd, v
14111425
SDL_RenderCommand *finalcmd = cmd;
14121426
SDL_RenderCommand *nextcmd = cmd->next;
14131427
size_t count = cmd->data.draw.count;
1428+
Uint8 pos_len = cmd->data.draw.tentatively_named_rendergeometry_position_coordinate_count;
14141429
int ret;
14151430
while (nextcmd) {
14161431
const SDL_RenderCommandType nextcmdtype = nextcmd->command;
@@ -1447,12 +1462,12 @@ static bool GL_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *cmd, v
14471462
} else {
14481463
// SetDrawState handles glEnableClientState.
14491464
if (thistexture) {
1450-
data->glVertexPointer(2, GL_FLOAT, sizeof(float) * 8, verts + 0);
1451-
data->glColorPointer(4, GL_FLOAT, sizeof(float) * 8, verts + 2);
1452-
data->glTexCoordPointer(2, GL_FLOAT, sizeof(float) * 8, verts + 6);
1465+
data->glVertexPointer(pos_len, GL_FLOAT, sizeof(float) * 10, verts + 0);
1466+
data->glColorPointer(4, GL_FLOAT, sizeof(float) * 10, verts + 4);
1467+
data->glTexCoordPointer(2, GL_FLOAT, sizeof(float) * 10, verts + 8);
14531468
} else {
1454-
data->glVertexPointer(2, GL_FLOAT, sizeof(float) * 6, verts + 0);
1455-
data->glColorPointer(4, GL_FLOAT, sizeof(float) * 6, verts + 2);
1469+
data->glVertexPointer(pos_len, GL_FLOAT, sizeof(float) * 8, verts + 0);
1470+
data->glColorPointer(4, GL_FLOAT, sizeof(float) * 8, verts + 4);
14561471
}
14571472
}
14581473

0 commit comments

Comments
 (0)