diff --git a/plugins/Cardinal/src/DearImGui.cpp b/plugins/Cardinal/src/DearImGui.cpp index df0de0c..79228ea 100644 --- a/plugins/Cardinal/src/DearImGui.cpp +++ b/plugins/Cardinal/src/DearImGui.cpp @@ -28,7 +28,7 @@ #include "DearImGui/imgui_draw.cpp" #include "DearImGui/imgui_tables.cpp" #include "DearImGui/imgui_widgets.cpp" -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) # include "DearImGui/imgui_impl_opengl3.cpp" #else # include "DearImGui/imgui_impl_opengl2.cpp" diff --git a/plugins/Cardinal/src/ImGuiWidget.cpp b/plugins/Cardinal/src/ImGuiWidget.cpp index ec88a82..075415b 100644 --- a/plugins/Cardinal/src/ImGuiWidget.cpp +++ b/plugins/Cardinal/src/ImGuiWidget.cpp @@ -23,7 +23,7 @@ # include "../../../dpf/dgl/src/Resources.hpp" #endif -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) # include "DearImGui/imgui_impl_opengl3.h" #else # include "DearImGui/imgui_impl_opengl2.h" @@ -97,7 +97,7 @@ struct ImGuiWidget::PrivateData { if (created) { ImGui::SetCurrentContext(context); -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) ImGui_ImplOpenGL3_Shutdown(); #else ImGui_ImplOpenGL2_Shutdown(); @@ -171,7 +171,7 @@ struct ImGuiWidget::PrivateData { if (created) { ImGui::SetCurrentContext(context); -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) ImGui_ImplOpenGL3_Shutdown(); #else ImGui_ImplOpenGL2_Shutdown(); @@ -191,7 +191,7 @@ struct ImGuiWidget::PrivateData { if (doInit) { -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) ImGui_ImplOpenGL3_Init(); #else ImGui_ImplOpenGL2_Init(); @@ -262,7 +262,7 @@ void ImGuiWidget::onContextCreate(const ContextCreateEvent& e) DISTRHO_SAFE_ASSERT_RETURN(!imData->created,); ImGui::SetCurrentContext(imData->context); -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) ImGui_ImplOpenGL3_Init(); #else ImGui_ImplOpenGL2_Init(); @@ -275,7 +275,7 @@ void ImGuiWidget::onContextDestroy(const ContextDestroyEvent& e) if (imData->created) { ImGui::SetCurrentContext(imData->context); -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) ImGui_ImplOpenGL3_Shutdown(); #else ImGui_ImplOpenGL2_Shutdown(); @@ -481,7 +481,7 @@ void ImGuiWidget::drawFramebufferCommon(const Vec& fbSize, const float scaleFact } } -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) // TODO? #else glMatrixMode(GL_PROJECTION); @@ -499,7 +499,7 @@ void ImGuiWidget::drawFramebufferCommon(const Vec& fbSize, const float scaleFact if (!imData->created) { -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) ImGui_ImplOpenGL3_Init(); #else ImGui_ImplOpenGL2_Init(); @@ -511,7 +511,7 @@ void ImGuiWidget::drawFramebufferCommon(const Vec& fbSize, const float scaleFact io.DeltaTime = time - imData->lastFrameTime; imData->lastFrameTime = time; -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) ImGui_ImplOpenGL3_NewFrame(); #else ImGui_ImplOpenGL2_NewFrame(); @@ -523,7 +523,7 @@ void ImGuiWidget::drawFramebufferCommon(const Vec& fbSize, const float scaleFact if (ImDrawData* const data = ImGui::GetDrawData()) { -#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) +#if defined(DGL_USE_OPENGL3) ImGui_ImplOpenGL3_RenderDrawData(data); #else ImGui_ImplOpenGL2_RenderDrawData(data);