From 19851699246ef63cf4b6a6e5740de8d3535089f7 Mon Sep 17 00:00:00 2001 From: Joel Linn Date: Sun, 17 Nov 2019 23:54:59 +0100 Subject: [PATCH] [imgui] Make code compile with new imgui. --- src/xenia/debug/ui/debug_window.cc | 27 ++++++++++++++------------- src/xenia/gpu/trace_viewer.cc | 27 ++++++++++++++++----------- src/xenia/ui/imgui_drawer.cc | 29 ++++++++++------------------- src/xenia/ui/imgui_drawer.h | 3 ++- third_party/imgui.lua | 7 ++++--- 5 files changed, 46 insertions(+), 47 deletions(-) diff --git a/src/xenia/debug/ui/debug_window.cc b/src/xenia/debug/ui/debug_window.cc index 8ee6b4b91..de1034d97 100644 --- a/src/xenia/debug/ui/debug_window.cc +++ b/src/xenia/debug/ui/debug_window.cc @@ -321,7 +321,7 @@ void DebugWindow::DrawSourcePane() { // address start - end // name text box (editable) // combo for interleaved + [ppc, hir, opt hir, x64 + byte with sizes] - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text("%s", function->module()->name().c_str()); ImGui::SameLine(); ImGui::Dummy(ImVec2(4, 0)); @@ -868,7 +868,7 @@ void DebugWindow::DrawRegistersPane() { } ImGui::BeginChild("##guest_general"); ImGui::BeginGroup(); - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text(" lr"); ImGui::SameLine(); ImGui::Dummy(ImVec2(4, 0)); @@ -877,7 +877,7 @@ void DebugWindow::DrawRegistersPane() { DrawRegisterTextBox(100, &thread_info->guest_context.lr); ImGui::EndGroup(); ImGui::BeginGroup(); - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text("ctr"); ImGui::SameLine(); ImGui::Dummy(ImVec2(4, 0)); @@ -891,7 +891,7 @@ void DebugWindow::DrawRegistersPane() { // VSCR for (int i = 0; i < 32; ++i) { ImGui::BeginGroup(); - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text(i < 10 ? " r%d" : "r%d", i); ImGui::SameLine(); ImGui::Dummy(ImVec2(4, 0)); @@ -909,7 +909,7 @@ void DebugWindow::DrawRegistersPane() { ImGui::BeginChild("##guest_float"); for (int i = 0; i < 32; ++i) { ImGui::BeginGroup(); - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text(i < 10 ? " f%d" : "f%d", i); ImGui::SameLine(); ImGui::Dummy(ImVec2(4, 0)); @@ -927,7 +927,7 @@ void DebugWindow::DrawRegistersPane() { ImGui::BeginChild("##guest_vector"); for (int i = 0; i < 128; ++i) { ImGui::BeginGroup(); - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text(i < 10 ? " v%d" : (i < 100 ? " v%d" : "v%d"), i); ImGui::SameLine(); ImGui::Dummy(ImVec2(4, 0)); @@ -943,7 +943,7 @@ void DebugWindow::DrawRegistersPane() { for (int i = 0; i < 18; ++i) { auto reg = static_cast(i); ImGui::BeginGroup(); - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text("%3s", X64Context::GetRegisterName(reg)); ImGui::SameLine(); ImGui::Dummy(ImVec2(4, 0)); @@ -968,7 +968,7 @@ void DebugWindow::DrawRegistersPane() { auto reg = static_cast(static_cast(X64Register::kXmm0) + i); ImGui::BeginGroup(); - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text("%5s", X64Context::GetRegisterName(reg)); ImGui::SameLine(); ImGui::Dummy(ImVec2(4, 0)); @@ -1017,7 +1017,7 @@ void DebugWindow::DrawThreadsPane() { } ImGui::PushID(thread_info); if (is_current_thread) { - ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Always); + ImGui::SetNextTreeNodeOpen(true, ImGuiCond_Always); } const char* state_label = "?"; if (thread->can_debugger_suspend()) { @@ -1037,8 +1037,9 @@ void DebugWindow::DrawThreadsPane() { thread->is_guest_thread() ? "guest" : "host", state_label, thread->thread_id(), thread->handle(), thread->name().c_str()); - if (ImGui::CollapsingHeader(thread_label, nullptr, true, - is_current_thread)) { + if (ImGui::CollapsingHeader( + thread_label, + is_current_thread ? ImGuiTreeNodeFlags_DefaultOpen : 0)) { // | (log button) detail of kernel call categories // log button toggles only logging that thread ImGui::BulletText("Call Stack"); @@ -1133,7 +1134,7 @@ void DebugWindow::DrawBreakpointsPane() { if (ImGui::BeginPopup("##add_code_breakpoint")) { ++add_code_popup_render_count; - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text("PPC"); ImGui::SameLine(); ImGui::Dummy(ImVec2(2, 0)); @@ -1158,7 +1159,7 @@ void DebugWindow::DrawBreakpointsPane() { ImGui::PopItemWidth(); ImGui::Dummy(ImVec2(0, 2)); - ImGui::AlignFirstTextHeightToWidgets(); + ImGui::AlignTextToFramePadding(); ImGui::Text("x64"); ImGui::SameLine(); ImGui::Dummy(ImVec2(2, 0)); diff --git a/src/xenia/gpu/trace_viewer.cc b/src/xenia/gpu/trace_viewer.cc index 3c75df03d..822286650 100644 --- a/src/xenia/gpu/trace_viewer.cc +++ b/src/xenia/gpu/trace_viewer.cc @@ -201,8 +201,9 @@ void TraceViewer::DrawUI() { } void TraceViewer::DrawControllerUI() { - ImGui::SetNextWindowPos(ImVec2(5, 5), ImGuiSetCond_FirstUseEver); - if (!ImGui::Begin("Controller", nullptr, ImVec2(340, 60))) { + ImGui::SetNextWindowPos(ImVec2(5, 5), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2(340, 60)); + if (!ImGui::Begin("Controller", nullptr)) { ImGui::End(); return; } @@ -248,10 +249,11 @@ void TraceViewer::DrawControllerUI() { } void TraceViewer::DrawPacketDisassemblerUI() { - ImGui::SetNextWindowCollapsed(true, ImGuiSetCond_FirstUseEver); + ImGui::SetNextWindowCollapsed(true, ImGuiCond_FirstUseEver); ImGui::SetNextWindowPos(ImVec2(float(window_->width()) - 500 - 5, 5), - ImGuiSetCond_FirstUseEver); - if (!ImGui::Begin("Packet Disassembler", nullptr, ImVec2(500, 300))) { + ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2(500, 300)); + if (!ImGui::Begin("Packet Disassembler", nullptr)) { ImGui::End(); return; } @@ -456,8 +458,9 @@ int TraceViewer::RecursiveDrawCommandBufferUI( } void TraceViewer::DrawCommandListUI() { - ImGui::SetNextWindowPos(ImVec2(5, 70), ImGuiSetCond_FirstUseEver); - if (!ImGui::Begin("Command List", nullptr, ImVec2(200, 640))) { + ImGui::SetNextWindowPos(ImVec2(5, 70), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2(200, 640)); + if (!ImGui::Begin("Command List", nullptr)) { ImGui::End(); return; } @@ -535,7 +538,7 @@ void TraceViewer::DrawCommandListUI() { } ImGui::PopID(); if (did_seek && target_command == -1) { - ImGui::SetScrollPosHere(); + ImGui::SetScrollHereY(); } auto id = RecursiveDrawCommandBufferUI(frame, frame->command_tree.get()); @@ -1052,8 +1055,9 @@ void TraceViewer::DrawStateUI() { auto& regs = *graphics_system_->register_file(); ImGui::SetNextWindowPos(ImVec2(float(window_->width()) - 500 - 5, 30), - ImGuiSetCond_FirstUseEver); - if (!ImGui::Begin("State", nullptr, ImVec2(500, 680))) { + ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2(500, 680)); + if (!ImGui::Begin("State", nullptr)) { ImGui::End(); return; } @@ -1330,7 +1334,8 @@ void TraceViewer::DrawStateUI() { ImGui::BulletText("Blend Color: (%.2f,%.2f,%.2f,%.2f)", blend_color.x, blend_color.y, blend_color.z, blend_color.w); ImGui::SameLine(); - ImGui::ColorButton(blend_color, true); + // TODO small_height (was true) parameter was removed + ImGui::ColorButton(nullptr, blend_color); uint32_t rb_color_mask = regs[XE_GPU_REG_RB_COLOR_MASK].u32; uint32_t color_info[4] = { diff --git a/src/xenia/ui/imgui_drawer.cc b/src/xenia/ui/imgui_drawer.cc index 642e5ec45..8a12afd8e 100644 --- a/src/xenia/ui/imgui_drawer.cc +++ b/src/xenia/ui/imgui_drawer.cc @@ -34,21 +34,18 @@ ImGuiDrawer::ImGuiDrawer(xe::ui::Window* window) } ImGuiDrawer::~ImGuiDrawer() { - auto previous_state = ImGui::GetInternalState(); - ImGui::SetInternalState(internal_state_.data()); - ImGui::Shutdown(); - if (previous_state != internal_state_.data()) { - ImGui::SetInternalState(previous_state); + if (internal_state_) { + ImGui::DestroyContext(internal_state_); + internal_state_ = nullptr; } - current_drawer_ = nullptr; } void ImGuiDrawer::Initialize() { // Setup ImGui internal state. // This will give us state we can swap to the ImGui globals when in use. - internal_state_.resize(ImGui::GetInternalStateSize()); - ImGui::SetInternalState(internal_state_.data(), true); + internal_state_ = ImGui::CreateContext(); + current_drawer_ = this; auto& io = ImGui::GetIO(); @@ -66,7 +63,6 @@ void ImGuiDrawer::Initialize() { auto& style = ImGui::GetStyle(); style.ScrollbarRounding = 0; - style.WindowFillAlphaDefault = 1.0f; style.WindowRounding = 0; style.Colors[ImGuiCol_Text] = ImVec4(0.89f, 0.90f, 0.90f, 1.00f); style.Colors[ImGuiCol_TextDisabled] = ImVec4(0.60f, 0.60f, 0.60f, 1.00f); @@ -87,7 +83,7 @@ void ImGuiDrawer::Initialize() { ImVec4(0.00f, 1.00f, 0.15f, 0.62f); style.Colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.00f, 0.91f, 0.09f, 0.40f); - style.Colors[ImGuiCol_ComboBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.99f); + style.Colors[ImGuiCol_PopupBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.99f); style.Colors[ImGuiCol_CheckMark] = ImVec4(0.74f, 0.90f, 0.72f, 0.50f); style.Colors[ImGuiCol_SliderGrab] = ImVec4(1.00f, 1.00f, 1.00f, 0.30f); style.Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.34f, 0.75f, 0.11f, 1.00f); @@ -97,23 +93,18 @@ void ImGuiDrawer::Initialize() { style.Colors[ImGuiCol_Header] = ImVec4(0.00f, 0.40f, 0.00f, 0.71f); style.Colors[ImGuiCol_HeaderHovered] = ImVec4(0.00f, 0.60f, 0.26f, 0.80f); style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.00f, 0.75f, 0.00f, 0.80f); - style.Colors[ImGuiCol_Column] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); - style.Colors[ImGuiCol_ColumnHovered] = ImVec4(0.36f, 0.89f, 0.38f, 1.00f); - style.Colors[ImGuiCol_ColumnActive] = ImVec4(0.13f, 0.50f, 0.11f, 1.00f); + style.Colors[ImGuiCol_Separator] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); + style.Colors[ImGuiCol_SeparatorHovered] = ImVec4(0.36f, 0.89f, 0.38f, 1.00f); + style.Colors[ImGuiCol_SeparatorActive] = ImVec4(0.13f, 0.50f, 0.11f, 1.00f); style.Colors[ImGuiCol_ResizeGrip] = ImVec4(1.00f, 1.00f, 1.00f, 0.30f); style.Colors[ImGuiCol_ResizeGripHovered] = ImVec4(1.00f, 1.00f, 1.00f, 0.60f); style.Colors[ImGuiCol_ResizeGripActive] = ImVec4(1.00f, 1.00f, 1.00f, 0.90f); - style.Colors[ImGuiCol_CloseButton] = ImVec4(0.00f, 0.72f, 0.00f, 0.96f); - style.Colors[ImGuiCol_CloseButtonHovered] = - ImVec4(0.38f, 1.00f, 0.42f, 0.60f); - style.Colors[ImGuiCol_CloseButtonActive] = ImVec4(0.56f, 1.00f, 0.64f, 1.00f); style.Colors[ImGuiCol_PlotLines] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); style.Colors[ImGuiCol_PlotLinesHovered] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f); style.Colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f); style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f); style.Colors[ImGuiCol_TextSelectedBg] = ImVec4(0.00f, 1.00f, 0.00f, 0.21f); - style.Colors[ImGuiCol_TooltipBg] = ImVec4(0.05f, 0.05f, 0.10f, 0.90f); style.Colors[ImGuiCol_ModalWindowDarkening] = ImVec4(0.20f, 0.20f, 0.20f, 0.35f); @@ -231,7 +222,7 @@ void ImGuiDrawer::RenderDrawLists(ImDrawData* data) { ImGuiIO& ImGuiDrawer::GetIO() { current_drawer_ = this; - ImGui::SetInternalState(internal_state_.data()); + ImGui::SetCurrentContext(internal_state_); return ImGui::GetIO(); } diff --git a/src/xenia/ui/imgui_drawer.h b/src/xenia/ui/imgui_drawer.h index d66edef7d..15ee84121 100644 --- a/src/xenia/ui/imgui_drawer.h +++ b/src/xenia/ui/imgui_drawer.h @@ -18,6 +18,7 @@ struct ImDrawData; struct ImFontAtlas; +struct ImGuiContext; struct ImGuiIO; namespace xe { @@ -56,7 +57,7 @@ class ImGuiDrawer : public WindowListener { Window* window_ = nullptr; GraphicsContext* graphics_context_ = nullptr; - std::vector internal_state_; + ImGuiContext* internal_state_ = nullptr; std::unique_ptr font_atlas_; std::unique_ptr font_texture_; }; diff --git a/third_party/imgui.lua b/third_party/imgui.lua index 9e5b63a76..900e208a9 100644 --- a/third_party/imgui.lua +++ b/third_party/imgui.lua @@ -18,9 +18,10 @@ project("imgui") "imgui/imgui_draw.cpp", "imgui/imgui_demo.cpp", "imgui/imgui_internal.h", - "imgui/stb_rect_pack.h", - "imgui/stb_textedit.h", - "imgui/stb_truetype.h", + "imgui/imgui_widgets.cpp", + "imgui/imstb_rectpack.h", + "imgui/imstb_textedit.h", + "imgui/imstb_truetype.h", }) filter("platforms:Windows")