no textureID

Author: lil2kki

src/ImGui.hpp

@@ -7,21 +7,6 @@
 
 using namespace cocos2d;
 
-// little helper function to convert ImTexture2D <=> GLuint,
-// supporting both versions of imgui where this was a void* and is now a u64
-// (templated because c++ is stupid)
-template <class T = ImTextureID>
-static auto textureID(auto value) {
-    if constexpr (std::is_same_v<decltype(value), GLuint>) { // GLuint -> ImTextureID
-        if constexpr (std::is_same_v<T, void*>) return reinterpret_cast<T>(static_cast<std::uintptr_t>(value));
-        else return static_cast<T>(value);
-    }
-    else { // ImTextureID -> GLuint
-        if constexpr (std::is_same_v<T, void*>) return static_cast<GLuint>(reinterpret_cast<std::uintptr_t>(value));
-        else return static_cast<GLuint>(value);
-    }
-}
-
 static std::ostream& operator<<(std::ostream& stream, ImVec2 const& vec) {
     return stream << vec.x << ", " << vec.y;
 }

src/backend.cpp

@@ -57,7 +57,7 @@ void DevTools::setupPlatform() {
     m_fontTexture->initWithData(pixels, kCCTexture2DPixelFormat_RGBA8888, width, height, CCSize(width, height));
     m_fontTexture->retain();
 
-    io.Fonts->SetTexID(textureID(m_fontTexture->getName()));
+    io.Fonts->SetTexID(reinterpret_cast<ImTextureID>(static_cast<std::uintptr_t>(m_fontTexture->getName())));
 
     // fixes getMousePos to be relative to the GD view
     #ifndef GEODE_IS_MOBILE
@@ -219,7 +219,7 @@ void DevTools::renderDrawDataFallback(ImDrawData* draw_data) {
         auto* idxBuffer = list->IdxBuffer.Data;
         auto* vtxBuffer = list->VtxBuffer.Data;
         for (auto& cmd : list->CmdBuffer) {
-            ccGLBindTexture2D(textureID(cmd.GetTexID()));
+            ccGLBindTexture2D(static_cast<GLuint>(reinterpret_cast<std::uintptr_t>(cmd.GetTexID())));
 
             const auto rect = cmd.ClipRect;
             const auto orig = toCocos(ImVec2(rect.x, rect.y));
@@ -306,7 +306,7 @@ void DevTools::renderDrawData(ImDrawData* draw_data) {
         glBufferData(GL_ELEMENT_ARRAY_BUFFER, list->IdxBuffer.Size * sizeof(ImDrawIdx), list->IdxBuffer.Data, GL_STREAM_DRAW);
 
         for (auto& cmd : list->CmdBuffer) {
-            ccGLBindTexture2D(textureID(cmd.GetTexID()));
+            ccGLBindTexture2D(static_cast<GLuint>(reinterpret_cast<std::uintptr_t>(cmd.GetTexID())));
 
             const auto rect = cmd.ClipRect;
             const auto orig = toCocos(ImVec2(rect.x, rect.y));

src/platform/platform.cpp

@@ -43,7 +43,7 @@ void GLRenderCtx::cleanup() {
 GLRenderCtx::GLRenderCtx(ImVec2 const& size) : m_size(size) {}
 
 ImTextureID GLRenderCtx::texture() const {
-    return textureID(m_texture);
+    return reinterpret_cast<ImTextureID>(static_cast<std::uintptr_t>(m_texture));
 }
 
 ImVec2 GLRenderCtx::size() const {