From e723b31d0d5a93d0fb43f764e797913062758e16 Mon Sep 17 00:00:00 2001
From: Joel16 <joel16dev@gmail.com>
Date: Mon, 7 Feb 2022 13:10:50 -0500
Subject: [PATCH] imGui: Update to v1.87 and remove unnecessary headers

---
 include/imgui_impl_vitagl.h | 21 ++++++++++++++++++++-
 include/imgui_vita.h        |  6 ------
 libs/imgui                  |  2 +-
 source/gui.cpp              |  4 +---
 source/main.cpp             |  2 +-
 5 files changed, 23 insertions(+), 12 deletions(-)
 delete mode 100644 include/imgui_vita.h

diff --git a/include/imgui_impl_vitagl.h b/include/imgui_impl_vitagl.h
index 4a4b6ba..a16628f 100644
--- a/include/imgui_impl_vitagl.h
+++ b/include/imgui_impl_vitagl.h
@@ -1,5 +1,24 @@
+// dear imgui: Renderer Backend for OpenGL2 (legacy OpenGL, fixed pipeline)
+// This needs to be used along with a Platform Backend (e.g. GLFW, SDL, Win32, custom..)
+
 // Implemented features:
-//  [X] User texture binding. Cast 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID in imgui.cpp.
+//  [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID!
+
+// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. 
+// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
+// If you are new to Dear ImGui, read documentation from the docs/ folder + read the top of imgui.cpp.
+// Read online: https://github.com/ocornut/imgui/tree/master/docs
+
+// **DO NOT USE THIS CODE IF YOUR CODE/ENGINE IS USING MODERN OPENGL (SHADERS, VBO, VAO, etc.)**
+// **Prefer using the code in imgui_impl_opengl3.cpp**
+// This code is mostly provided as a reference to learn how ImGui integration works, because it is shorter to read.
+// If your code is using GL3+ context or any semi modern OpenGL calls, using this is likely to make everything more
+// complicated, will require your code to reset every single OpenGL attributes to their initial state, and might
+// confuse your GPU driver.
+// The GL2 code is unable to reset attributes or even call e.g. "glUseProgram(0)" because they don't exist in that API.
+
+#pragma once
+#include "imgui.h"      // IMGUI_IMPL_API
 
 IMGUI_API bool ImGui_ImplVitaGL_Init(void);
 IMGUI_API void ImGui_ImplVitaGL_Shutdown(void);
diff --git a/include/imgui_vita.h b/include/imgui_vita.h
deleted file mode 100644
index 661ac60..0000000
--- a/include/imgui_vita.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _IMGUI_VITA_
-
-#include "imgui.h"
-#include "imgui_impl_vitagl.h"
-
-#endif
diff --git a/libs/imgui b/libs/imgui
index 512c54b..c71a50d 160000
--- a/libs/imgui
+++ b/libs/imgui
@@ -1 +1 @@
-Subproject commit 512c54bbc062c41c74f8a8bd8ff1fd6bebd1e6d0
+Subproject commit c71a50deb5ddf1ea386b91e60fa2e4a26d080074
diff --git a/source/gui.cpp b/source/gui.cpp
index dd36b91..26ae6ac 100644
--- a/source/gui.cpp
+++ b/source/gui.cpp
@@ -1,11 +1,9 @@
-#include <imgui_vita.h>
 #include <vitaGL.h>
 
 #include "config.h"
 #include "fs.h"
 #include "gui.h"
-#include "imgui.h"
-#include "imgui_internal.h"
+#include "imgui_impl_vitagl.h"
 #include "utils.h"
 #include "windows.h"
 
diff --git a/source/main.cpp b/source/main.cpp
index 5fabd71..714e582 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,10 +1,10 @@
-#include <imgui_vita.h>
 #include <psp2/sysmodule.h>
 #include <vitaGL.h>
 
 #include "config.h"
 #include "fs.h"
 #include "gui.h"
+#include "imgui_impl_vitagl.h"
 #include "log.h"
 #include "textures.h"
 #include "utils.h"