Merge pull request #1803 from nicolasnoble/update-imgui

Updating imgui to fix compilation issue.

Author: nicolasnoble

src/gui/gui.cc

@@ -1052,7 +1052,7 @@ void PCSX::GUI::endFrame() {
     m_outputShaderEditor.configure(this);
 
     if (m_fullWindowRender) {
-        ImTextureID texture = reinterpret_cast<ImTextureID*>(m_offscreenTextures[m_currentTexture]);
+        ImTextureID texture = m_offscreenTextures[m_currentTexture];
         const auto basePos = ImGui::GetMainViewport()->Pos;
         const auto displayFramebufferScale = ImGui::GetIO().DisplayFramebufferScale;
         const auto logicalRenderSize =
@@ -1086,7 +1086,7 @@ void PCSX::GUI::endFrame() {
                 m_setupScreenSize = true;
             }
             ImGuiHelpers::normalizeDimensions(textureSize, renderRatio);
-            ImTextureID texture = reinterpret_cast<ImTextureID*>(m_offscreenTextures[m_currentTexture]);
+            ImTextureID texture = m_offscreenTextures[m_currentTexture];
             if (g_system->getArgs().isShadersDisabled()) {
                 ImGui::Image(texture, textureSize, ImVec2(0, 0), ImVec2(1, 1));
             } else {

src/gui/widgets/memcard_manager.cc

@@ -352,7 +352,7 @@ void PCSX::Widgets::MemcardManager::drawIcon(const PCSX::SIO::McdBlock& block) {
         glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 32, 32, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
     }
 
-    ImGui::Image(reinterpret_cast<ImTextureID*>(texture), ImVec2(m_iconSize, m_iconSize));
+    ImGui::Image(texture, ImVec2(m_iconSize, m_iconSize));
 }
 
 // Extract the pocketstation icon from the block indicated by blockNumber into the pixels array (In RGBA8888)

src/gui/widgets/shader-editor.cc

@@ -711,7 +711,7 @@ void PCSX::Widgets::ShaderEditor::renderWithImgui(GUI *gui, ImTextureID textureI
             if (L.isfunction()) {
                 L.copy(-2);
                 L.setfenv();
-                L.push(static_cast<lua_Number>(reinterpret_cast<uintptr_t>(textureID)));
+                L.push(static_cast<lua_Number>(textureID));
                 L.push(srcSize.x);
                 L.push(srcSize.y);
                 L.push(dstSize.x);
@@ -752,7 +752,7 @@ void PCSX::Widgets::ShaderEditor::renderWithImgui(GUI *gui, ImTextureID textureI
 }
 
 void PCSX::Widgets::ShaderEditor::imguiCB(const ImDrawList *parentList, const ImDrawCmd *cmd) {
-    GLuint textureID = static_cast<GLuint>(reinterpret_cast<uintptr_t>(cmd->TextureId));
+    GLuint textureID = static_cast<GLuint>(cmd->TextureId);
 
     GLfloat projMtx[4][4];
     if (m_imguiProjMtxLoc == -1) {

src/gui/widgets/vram-viewer.cc

@@ -422,7 +422,7 @@ void PCSX::Widgets::VRAMViewer::drawVRAM(GUI *gui, GLuint textureID) {
     ImVec2 texTL = ImVec2(0.0f, 0.0f) - m_cornerTL / dimensions;
     ImVec2 texBR = ImVec2(1.0f, 1.0f) - (m_cornerBR - m_resolution) / dimensions;
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-    ImGui::ImageButton("vram", reinterpret_cast<ImTextureID *>(textureID), m_resolution, texTL, texBR);
+    ImGui::ImageButton("vram", textureID, m_resolution, texTL, texBR);
     ImGui::PopStyleVar();
     if (m_clutDestination && m_selectingClut) {
         m_clutDestination->m_clut = m_mouseUV;

third_party/ImFileDialog/ImFileDialog.cpp

@@ -1187,7 +1187,7 @@ namespace ifd {
 
 				bool isSelected = std::count(m_selections.begin(), m_selections.end(), entry.Path);
 
-				if (FileIcon(filename.c_str(), isSelected, entry.HasIconPreview ? entry.IconPreview : (ImTextureID)m_getIcon(entry.Path), ImVec2(32 + 16 * m_zoom, 32 + 16 * m_zoom), entry.HasIconPreview, entry.IconPreviewWidth, entry.IconPreviewHeight)) {
+				if (FileIcon(filename.c_str(), isSelected, entry.HasIconPreview ? (ImTextureID)entry.IconPreview : (ImTextureID)m_getIcon(entry.Path), ImVec2(32 + 16 * m_zoom, 32 + 16 * m_zoom), entry.HasIconPreview, entry.IconPreviewWidth, entry.IconPreviewHeight)) {
 					std::error_code ec;
 					bool isDir = std::filesystem::is_directory(entry.Path, ec);