Skip to content

Commit 97a3ad7

Browse files
committed
sokol_imgui.h: fix for ImDrawCallback_ResetRenderState deprecation in Dear ImGui 1.92.8
1 parent 2ef8487 commit 97a3ad7

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

util/sokol_imgui.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2812,8 +2812,10 @@ SOKOL_API_IMPL void simgui_render(void) {
28122812
ImDrawCmd* pcmd = &cl->CmdBuffer.Data[cmd_index];
28132813
if (pcmd->UserCallback != 0) {
28142814
// User callback, registered via ImDrawList::AddCallback()
2815-
// (ImDrawCallback_ResetRenderState is a special callback value used by the user to request the renderer to reset render state.)
2816-
if (pcmd->UserCallback != ImDrawCallback_ResetRenderState) {
2815+
// NOTE: once the deprecated ImDrawCallback_ResetRenderState define has
2816+
// been completely removed from Dear ImGui the below magic value can be removed too
2817+
const intptr_t deprecated_ImDrawCallback_ResetRenderState_magic_value = (-8);
2818+
if ((intptr_t)pcmd->UserCallback != deprecated_ImDrawCallback_ResetRenderState_magic_value) {
28172819
pcmd->UserCallback(cl, pcmd);
28182820
// need to re-apply all state after calling a user callback
28192821
sg_reset_state_cache();

0 commit comments

Comments
 (0)