mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-11 22:38:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-add SDL_assert() with non boolean ptr syntax (#8531)

Browse Source
This commit is contained in:
Sylvain Becker
2023-11-11 10:29:05 +01:00
committed by GitHub
parent c29df1699e
commit f3419d8c04
37 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/render/SDL_render.c
View File

@@ -237,7 +237,7 @@ static int FlushRenderCommands(SDL_Renderer *renderer)
{
int retval;
SDL_assert((!renderer->render_commands) == (!renderer->render_commands_tail));
SDL_assert((renderer->render_commands == NULL) == (renderer->render_commands_tail == NULL));
if (!renderer->render_commands) { /* nothing to do! */
SDL_assert(renderer->vertex_data_used == 0);
@@ -335,7 +335,7 @@ static SDL_RenderCommand *AllocateRenderCommand(SDL_Renderer *renderer)
}
}
SDL_assert((!renderer->render_commands) == (!renderer->render_commands_tail));
SDL_assert((renderer->render_commands == NULL) == (renderer->render_commands_tail == NULL));
if (renderer->render_commands_tail) {
renderer->render_commands_tail->next = retval;
} else {
@@ -883,13 +883,13 @@ static SDL_INLINE void VerifyDrawQueueFunctions(const SDL_Renderer *renderer)
{
/* all of these functions are required to be implemented, even as no-ops, so we don't
have to check that they aren't NULL over and over. */
SDL_assert(renderer->QueueSetViewport);
SDL_assert(renderer->QueueSetDrawColor);
SDL_assert(renderer->QueueDrawPoints);
SDL_assert(renderer->QueueDrawLines || renderer->QueueGeometry);
SDL_assert(renderer->QueueFillRects || renderer->QueueGeometry);
SDL_assert(renderer->QueueCopy || renderer->QueueGeometry);
SDL_assert(renderer->RunCommandQueue);
SDL_assert(renderer->QueueSetViewport != NULL);
SDL_assert(renderer->QueueSetDrawColor != NULL);
SDL_assert(renderer->QueueDrawPoints != NULL);
SDL_assert(renderer->QueueDrawLines != NULL || renderer->QueueGeometry != NULL);
SDL_assert(renderer->QueueFillRects != NULL || renderer->QueueGeometry != NULL);
SDL_assert(renderer->QueueCopy != NULL || renderer->QueueGeometry != NULL);
SDL_assert(renderer->RunCommandQueue != NULL);
}
static SDL_RenderLineMethod SDL_GetRenderLineMethod()

2
src/render/direct3d/SDL_render_d3d.c
View File

@@ -939,7 +939,7 @@ static int SetupTextureState(D3D_RenderData *data, SDL_Texture *texture, LPDIREC
{
D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata;
SDL_assert(!*shader);
SDL_assert(*shader == NULL);
if (!texturedata) {
return SDL_SetError("Texture is not currently available");

2
src/render/software/SDL_render_sw.c
View File

@@ -641,7 +641,7 @@ static void SetDrawState(SDL_Surface *surface, SW_DrawStateCache *drawstate)
if (drawstate->surface_cliprect_dirty) {
const SDL_Rect *viewport = drawstate->viewport;
const SDL_Rect *cliprect = drawstate->cliprect;
SDL_assert_release(viewport); /* the higher level should have forced a SDL_RENDERCMD_SETVIEWPORT */
SDL_assert_release(viewport != NULL); /* the higher level should have forced a SDL_RENDERCMD_SETVIEWPORT */
if (cliprect) {
SDL_Rect clip_rect;