Update ImGui to 1.91.4-docking.

profiler/src/main.cpp

@@ -112,11 +112,11 @@ static bool showReleaseNotes = false;
 static std::string releaseNotes;
 static uint8_t* iconPx;
 static int iconX, iconY;
-static void* iconTex;
+static ImTextureID iconTex;
 static int iconTexSz;
 static uint8_t* zigzagPx[6];
 static int zigzagX[6], zigzagY[6];
-void* zigzagTex;
+ImTextureID zigzagTex;
 static Backend* bptr;
 static bool s_customTitle = false;
 static bool s_isElevated = false;

profiler/src/profiler/TracyImGui.cpp

@@ -4,7 +4,7 @@
 #include "TracyPrint.hpp"
 #include "TracyImGui.hpp"
 
-extern void* zigzagTex;
+extern ImTextureID zigzagTex;
 
 namespace tracy
 {

profiler/src/profiler/TracyTexture.cpp

@@ -39,7 +39,7 @@ void InitTexture()
 #endif
 }
 
-void* MakeTexture( bool zigzag )
+ImTextureID MakeTexture( bool zigzag )
 {
     GLuint tex;
     glGenTextures( 1, &tex );
@@ -48,12 +48,12 @@ void* MakeTexture( bool zigzag )
     glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
     glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, zigzag ? GL_REPEAT : GL_CLAMP_TO_EDGE );
     glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
-    return (void*)(intptr_t)tex;
+    return tex;
 }
 
-void FreeTexture( void* _tex, void(*runOnMainThread)(const std::function<void()>&, bool) )
+void FreeTexture( ImTextureID _tex, void(*runOnMainThread)(const std::function<void()>&, bool) )
 {
-    auto tex = (GLuint)(intptr_t)_tex;
+    auto tex = (GLuint)_tex;
     runOnMainThread( [tex] { glDeleteTextures( 1, &tex ); }, false );
 }
 
@@ -139,9 +139,9 @@ static tracy_force_inline void DecodeDxt1Part( uint64_t d, uint32_t* dst, uint32
     memcpy( dst+3, dict + (idx & 0x3), 4 );
 }
 
-void UpdateTexture( void* _tex, const char* data, int w, int h )
+void UpdateTexture( ImTextureID _tex, const char* data, int w, int h )
 {
-    auto tex = (GLuint)(intptr_t)_tex;
+    auto tex = (GLuint)_tex;
     glBindTexture( GL_TEXTURE_2D, tex );
     if( s_hardwareS3tc )
     {
@@ -167,16 +167,16 @@ void UpdateTexture( void* _tex, const char* data, int w, int h )
     }
 }
 
-void UpdateTextureRGBA( void* _tex, void* data, int w, int h )
+void UpdateTextureRGBA( ImTextureID _tex, void* data, int w, int h )
 {
-    auto tex = (GLuint)(intptr_t)_tex;
+    auto tex = (GLuint)_tex;
     glBindTexture( GL_TEXTURE_2D, tex );
     glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
 }
 
-void UpdateTextureRGBAMips( void* _tex, void** data, int* w, int* h, size_t mips )
+void UpdateTextureRGBAMips( ImTextureID _tex, void** data, int* w, int* h, size_t mips )
 {
-    auto tex = (GLuint)(intptr_t)_tex;
+    auto tex = (GLuint)_tex;
     glBindTexture( GL_TEXTURE_2D, tex );
     for( size_t i=0; i<mips; i++ )
     {

profiler/src/profiler/TracyTexture.hpp

@@ -2,16 +2,17 @@
 #define __TRACYTEXTURE_HPP__
 
 #include <functional>
+#include <imgui.h>
 
 namespace tracy
 {
 
 void InitTexture();
-void* MakeTexture( bool zigzag = false );
-void FreeTexture( void* tex, void(*runOnMainThread)(const std::function<void()>&, bool) );
-void UpdateTexture( void* tex, const char* data, int w, int h );
-void UpdateTextureRGBA( void* tex, void* data, int w, int h );
-void UpdateTextureRGBAMips( void* tex, void** data, int* w, int* h, size_t mips );
+ImTextureID MakeTexture( bool zigzag = false );
+void FreeTexture( ImTextureID tex, void(*runOnMainThread)(const std::function<void()>&, bool) );
+void UpdateTexture( ImTextureID tex, const char* data, int w, int h );
+void UpdateTextureRGBA( ImTextureID tex, void* data, int w, int h );
+void UpdateTextureRGBAMips( ImTextureID tex, void** data, int* w, int* h, size_t mips );
 
 }
 

profiler/src/profiler/TracyView.hpp

@@ -597,10 +597,10 @@ private:
     std::atomic<size_t> m_srcFileBytes { 0 };
     std::atomic<size_t> m_dstFileBytes { 0 };
 
-    void* m_frameTexture = nullptr;
+    ImTextureID m_frameTexture = 0;
     const void* m_frameTexturePtr = nullptr;
 
-    void* m_frameTextureConn = nullptr;
+    ImTextureID m_frameTextureConn = 0;
     const void* m_frameTextureConnPtr = nullptr;
 
     std::vector<std::unique_ptr<Annotation>> m_annotations;
@@ -859,7 +859,7 @@ private:
     } m_cache;
 
     struct {
-        void* texture = nullptr;
+        ImTextureID texture = 0;
         float timeLeft = 0;
         float speed = 1;
         uint32_t frame = 0;