From ec1b60f8d87b30bbd3c56345d9cc693205aa0d4d Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sun, 8 May 2022 11:18:13 -0700 Subject: Changeset: 32 Branch comment: [] Update imgui to the docking branch --- 3rdparty/imgui/source/backends/imgui_impl_opengl3.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '3rdparty/imgui/source/backends/imgui_impl_opengl3.h') diff --git a/3rdparty/imgui/source/backends/imgui_impl_opengl3.h b/3rdparty/imgui/source/backends/imgui_impl_opengl3.h index 98c9aca..e7f652f 100644 --- a/3rdparty/imgui/source/backends/imgui_impl_opengl3.h +++ b/3rdparty/imgui/source/backends/imgui_impl_opengl3.h @@ -5,6 +5,7 @@ // Implemented features: // [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID! +// [X] Renderer: Multi-viewport support. Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. // [x] Renderer: Desktop GL only: Support for large meshes (64k+ vertices) with 16-bit indices. // You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. @@ -46,7 +47,7 @@ IMGUI_IMPL_API void ImGui_ImplOpenGL3_DestroyDeviceObjects(); #endif #if (defined(__APPLE__) && (TARGET_OS_IOS || TARGET_OS_TV)) || (defined(__ANDROID__)) #define IMGUI_IMPL_OPENGL_ES3 // iOS, Android -> GL ES 3, "#version 300 es" -#elif defined(__EMSCRIPTEN__) +#elif defined(__EMSCRIPTEN__) || defined(__amigaos4__) #define IMGUI_IMPL_OPENGL_ES2 // Emscripten -> GL ES 2, "#version 100" #else // Otherwise imgui_impl_opengl3_loader.h will be used. -- cgit v1.2.3-70-g09d2