brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup imgui code, only need to check for 1 GL3 macro

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-12-04 20:26:37 +00:00
parent c269d7228a
commit 5226aa5c4e
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/Cardinal/src/DearImGui.cpp
View file

@ -28,7 +28,7 @@
#include "DearImGui/imgui_draw.cpp" #include "DearImGui/imgui_draw.cpp"
#include "DearImGui/imgui_tables.cpp" #include "DearImGui/imgui_tables.cpp"
#include "DearImGui/imgui_widgets.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" # include "DearImGui/imgui_impl_opengl3.cpp"
#else #else
# include "DearImGui/imgui_impl_opengl2.cpp" # include "DearImGui/imgui_impl_opengl2.cpp"

20
plugins/Cardinal/src/ImGuiWidget.cpp
View file

@ -23,7 +23,7 @@
# include "../../../dpf/dgl/src/Resources.hpp" # include "../../../dpf/dgl/src/Resources.hpp"
#endif #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" # include "DearImGui/imgui_impl_opengl3.h"
#else #else
# include "DearImGui/imgui_impl_opengl2.h" # include "DearImGui/imgui_impl_opengl2.h"
@ -97,7 +97,7 @@ struct ImGuiWidget::PrivateData {
if (created) if (created)
{ {
ImGui::SetCurrentContext(context); ImGui::SetCurrentContext(context);
#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) #if defined(DGL_USE_OPENGL3)
ImGui_ImplOpenGL3_Shutdown(); ImGui_ImplOpenGL3_Shutdown();
#else #else
ImGui_ImplOpenGL2_Shutdown(); ImGui_ImplOpenGL2_Shutdown();
@ -171,7 +171,7 @@ struct ImGuiWidget::PrivateData {
if (created) if (created)
{ {
ImGui::SetCurrentContext(context); ImGui::SetCurrentContext(context);
#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) #if defined(DGL_USE_OPENGL3)
ImGui_ImplOpenGL3_Shutdown(); ImGui_ImplOpenGL3_Shutdown();
#else #else
ImGui_ImplOpenGL2_Shutdown(); ImGui_ImplOpenGL2_Shutdown();
@ -191,7 +191,7 @@ struct ImGuiWidget::PrivateData {
if (doInit) if (doInit)
{ {
#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) #if defined(DGL_USE_OPENGL3)
ImGui_ImplOpenGL3_Init(); ImGui_ImplOpenGL3_Init();
#else #else
ImGui_ImplOpenGL2_Init(); ImGui_ImplOpenGL2_Init();
@ -262,7 +262,7 @@ void ImGuiWidget::onContextCreate(const ContextCreateEvent& e)
DISTRHO_SAFE_ASSERT_RETURN(!imData->created,); DISTRHO_SAFE_ASSERT_RETURN(!imData->created,);
ImGui::SetCurrentContext(imData->context); 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(); ImGui_ImplOpenGL3_Init();
#else #else
ImGui_ImplOpenGL2_Init(); ImGui_ImplOpenGL2_Init();
@ -275,7 +275,7 @@ void ImGuiWidget::onContextDestroy(const ContextDestroyEvent& e)
if (imData->created) if (imData->created)
{ {
ImGui::SetCurrentContext(imData->context); 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(); ImGui_ImplOpenGL3_Shutdown();
#else #else
ImGui_ImplOpenGL2_Shutdown(); 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? // TODO?
#else #else
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
@ -499,7 +499,7 @@ void ImGuiWidget::drawFramebufferCommon(const Vec& fbSize, const float scaleFact
if (!imData->created) if (!imData->created)
{ {
#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) #if defined(DGL_USE_OPENGL3)
ImGui_ImplOpenGL3_Init(); ImGui_ImplOpenGL3_Init();
#else #else
ImGui_ImplOpenGL2_Init(); ImGui_ImplOpenGL2_Init();
@ -511,7 +511,7 @@ void ImGuiWidget::drawFramebufferCommon(const Vec& fbSize, const float scaleFact
io.DeltaTime = time - imData->lastFrameTime; io.DeltaTime = time - imData->lastFrameTime;
imData->lastFrameTime = time; imData->lastFrameTime = time;
#if defined(DGL_USE_GLES2) || defined(DGL_USE_GLES3) || defined(DGL_USE_OPENGL3) #if defined(DGL_USE_OPENGL3)
ImGui_ImplOpenGL3_NewFrame(); ImGui_ImplOpenGL3_NewFrame();
#else #else
ImGui_ImplOpenGL2_NewFrame(); ImGui_ImplOpenGL2_NewFrame();
@ -523,7 +523,7 @@ void ImGuiWidget::drawFramebufferCommon(const Vec& fbSize, const float scaleFact
if (ImDrawData* const data = ImGui::GetDrawData()) 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); ImGui_ImplOpenGL3_RenderDrawData(data);
#else #else
ImGui_ImplOpenGL2_RenderDrawData(data); ImGui_ImplOpenGL2_RenderDrawData(data);