organicmaps/imgui
13
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-04-07 22:43:09 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

WIP - Add ImTextureUserID_Invalid + introducing SetTexUserID().

Browse source 
Which gives us room for potentially updating ImDrawData during render.
This commit is contained in:
ocornut 2025-01-30 15:35:32 +01:00
parent e27b013f28
commit 8d9582ad1e
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
imgui.h
View file

@ -323,6 +323,11 @@ IM_MSVC_RUNTIME_CHECKS_RESTORE
typedef ImU64 ImTextureID; // Default: store a pointer or an integer fitting in a pointer (most renderer backends are ok with that)
#endif
// Define this to another value if you need value of 0 to be valid.
#ifndef ImTextureID_Invalid
#define ImTextureID_Invalid ((ImTextureID)0)
#endif
// ImTextureRef contains:
// - a texture/atlas pointer, typically when created by Dear ImGui itself.
// - OR a raw ImTextureID value (user/backend identifier), typically when created by user code to load images.
@ -3470,14 +3475,12 @@ struct IMGUI_API ImTextureData
int BytesPerPixel; // 4 or 1
int UniqueID; // Sequential index to facilitate identifying a texture when debugging/printing. Only unique per atlas.
unsigned char* Pixels; // Pointer to buffer holding 'Width*Height' pixels and 'Width*Height*BytesPerPixels' bytes.
ImTextureID TexID; // Identifier stored in ImDrawCmd::GetTexID() and passed to backend RenderDrawData loop.
ImTextureID TexID; // Always use SetTexID(): Identifier stored in ImDrawCmd::GetTexID() and passed to backend RenderDrawData loop.
void* BackendUserData; // Convenience storage for backend. Some backends may have enough with TexID.
ImTextureRect UpdateRect; // Bounding box encompassing all individual updates.
ImVector<ImTextureRect> Updates; // Array of individual updates.
int UnusedFrames; // In order to facilitate handling Status==WantDestroy in some backend: this is a count successive frames where the texture was not used.
// [Internal]
bool UseColors; // [Internal] Tell whether our texture data is known to use colors (rather than just white + alpha).
bool UseColors; // Tell whether our texture data is known to use colors (rather than just white + alpha).
bool WantDestroyNextFrame; // [Internal] Queued to set ImTextureStatus_WantDestroy next frame. May still be used in the current frame.
// Functions
@ -3491,6 +3494,7 @@ struct IMGUI_API ImTextureData
int GetPitch() const { return Width * BytesPerPixel; }
ImTextureRef GetTexRef() const { ImTextureRef tex_ref; tex_ref._TexData = (ImTextureData*)(void*)this; tex_ref._TexID = TexID; return tex_ref; }
ImTextureID GetTexID() const { return TexID; }
void SetTexID(ImTextureID tex_id){ TexID = tex_id; } // Called by the Renderer backend after creating or destroying the texture. Never modify TexID directly!
};
//-----------------------------------------------------------------------------
@ -3788,7 +3792,7 @@ inline ImTextureID ImDrawCmd::GetTexID() const
{
ImTextureID tex_id = TexRef._TexData ? TexRef._TexData->TexID : TexRef._TexID;
if (TexRef._TexData != NULL)
IM_ASSERT(tex_id && "ImDrawCmd is referring to Atlas texture that wasn't uploaded to graphics system.");
IM_ASSERT(tex_id != ImTextureID_Invalid && "ImDrawCmd is referring to ImTextureData that wasn't uploaded to graphics system. Backend must call ImTextureData::SetTexID()!");
return tex_id;
}

6
imgui_draw.cpp
View file

@ -2698,7 +2698,7 @@ void ImFontAtlasUpdateNewFrame(ImFontAtlas* atlas)
if (tex->Status == ImTextureStatus_Destroyed)
{
IM_ASSERT(tex->TexID == 0 && tex->BackendUserData == NULL);
IM_ASSERT(tex->TexID == ImTextureID_Invalid && tex->BackendUserData == NULL);
if (tex->WantDestroyNextFrame)
remove_from_list = true; // Destroy was scheduled by us
else
@ -2719,7 +2719,7 @@ void ImFontAtlasUpdateNewFrame(ImFontAtlas* atlas)
}
// If a texture has never reached the backend, they don't need to know about it.
if (tex->Status == ImTextureStatus_WantDestroy && tex->TexID == 0 && tex->BackendUserData == NULL)
if (tex->Status == ImTextureStatus_WantDestroy && tex->TexID == ImTextureID_Invalid && tex->BackendUserData == NULL)
remove_from_list = true;
// Remove
@ -3522,7 +3522,7 @@ ImTextureData* ImFontAtlasBuildAddTexture(ImFontAtlas* atlas, int w, int h)
/*if (old_tex != NULL && old_tex->Status == ImTextureStatus_WantCreate)
{
// Reuse texture not yet used by backend.
IM_ASSERT(old_tex->TexID == 0 && old_tex->BackendUserData == NULL);
IM_ASSERT(old_tex->TexID == ImTextureID_Invalid && old_tex->BackendUserData == NULL);
old_tex->DestroyPixels();
old_tex->Updates.clear();
new_tex = old_tex;