Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

imgui 1.90.6 -> 1.91.6 #788

Merged
merged 11 commits into from
Jan 11, 2025
Merged

imgui 1.90.6 -> 1.91.6 #788

merged 11 commits into from
Jan 11, 2025

Conversation

briaguya-ai
Copy link
Collaborator

@briaguya-ai briaguya-ai commented Jan 10, 2025

decided to handle the breaking ImTextureID change by patching imconfig.h to have

#define ImTextureID void*

to switch us back to what we had before (which is working)

note: i early merged #789 into this branch to get green checks on linux builds

soh pr:

edit: moved to draft, trying another thing
edit: other thing worked, moving back out of draft

stuff from before the `imconfig` patching most of these changes are from 9b6a91e where i mentioned

in ocornut/imgui@92b9498 ImTextureID was updated from void* to ImU64, which is defined as unsigned long long (which conflicts with some implementations of uint64_t that have it as unsigned long)

i linked some info on this and some other breaking changes in #770

i'm very open to feedback/ideas on how to handle this ImGui change - i know we have some other options but this one seemed reasonable

in ocornut/imgui@92b9498 `ImTextureID` was updated from `void*` to `ImU64`, which is defined as `unsigned long long` (which conflicts with some implementations of `uint64_t` that have it as `unsigned long`)
@briaguya-ai briaguya-ai changed the title Imgui 1916 imgui 1.90.6 -> 1.91.6 Jan 10, 2025
@briaguya-ai briaguya-ai marked this pull request as draft January 10, 2025 10:04
@briaguya-ai briaguya-ai marked this pull request as ready for review January 10, 2025 12:09
Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look sensible to me :shipit:

@Kenix3 Kenix3 merged commit 9a974e0 into Kenix3:main Jan 11, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants