From 1276a58d870fc1f71c96556449e1ef0626e125e3 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Tue, 19 Feb 2019 17:43:25 +0100 Subject: [PATCH] move imgui renderer into rend/gles. Fix gl4 term function --- core/{deps/imgui => rend/gles}/imgui_impl_opengl3.cpp | 2 +- core/{deps/imgui => rend/gles}/imgui_impl_opengl3.h | 0 core/rend/gui.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename core/{deps/imgui => rend/gles}/imgui_impl_opengl3.cpp (99%) rename core/{deps/imgui => rend/gles}/imgui_impl_opengl3.h (100%) diff --git a/core/deps/imgui/imgui_impl_opengl3.cpp b/core/rend/gles/imgui_impl_opengl3.cpp similarity index 99% rename from core/deps/imgui/imgui_impl_opengl3.cpp rename to core/rend/gles/imgui_impl_opengl3.cpp index 4ec3a1ccb..ac23861e2 100644 --- a/core/deps/imgui/imgui_impl_opengl3.cpp +++ b/core/rend/gles/imgui_impl_opengl3.cpp @@ -54,7 +54,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" +#include "imgui/imgui.h" #include "imgui_impl_opengl3.h" #include #if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier diff --git a/core/deps/imgui/imgui_impl_opengl3.h b/core/rend/gles/imgui_impl_opengl3.h similarity index 100% rename from core/deps/imgui/imgui_impl_opengl3.h rename to core/rend/gles/imgui_impl_opengl3.h diff --git a/core/rend/gui.cpp b/core/rend/gui.cpp index 4308fd972..8577de984 100644 --- a/core/rend/gui.cpp +++ b/core/rend/gui.cpp @@ -22,7 +22,7 @@ #include "cfg/cfg.h" #include "hw/maple/maple_cfg.h" #include "imgui/imgui.h" -#include "imgui/imgui_impl_opengl3.h" +#include "gles/imgui_impl_opengl3.h" #include "imgui/roboto_medium.h" #include "gles/gles.h" #include "input/gamepad_device.h"