ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ImGui] Use new ImageButton signature

This commit is contained in:
Joel Linn 2022-11-20 19:44:18 +01:00 committed by Rick Gibbed
parent d6b5cbd634
commit b641e39c4d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/xenia/gpu/trace_viewer.cc
View File

@ -736,8 +736,8 @@ void TraceViewer::DrawTextureInfo(
ImGui::Columns(2); ImGui::Columns(2);
if (texture) { if (texture) {
ImVec2 button_size(256, 256); ImVec2 button_size(256, 256);
if (ImGui::ImageButton(ImTextureID(texture), button_size, ImVec2(0, 0), if (ImGui::ImageButton("#texture_info_image", ImTextureID(texture),
ImVec2(1, 1))) { button_size, ImVec2(0, 0), ImVec2(1, 1))) {
// show viewer // show viewer
} }
} else { } else {
@ -1470,19 +1470,21 @@ void TraceViewer::DrawStateUI() {
ImVec2 button_pos = ImGui::GetCursorScreenPos(); ImVec2 button_pos = ImGui::GetCursorScreenPos();
ImVec2 button_size(256, 256); ImVec2 button_size(256, 256);
ImTextureID tex = 0; ImTextureID tex = 0;
ImGui::PushID(i);
if (write_mask) { if (write_mask) {
auto color_target = GetColorRenderTarget(surface_pitch, surface_msaa, auto color_target = GetColorRenderTarget(surface_pitch, surface_msaa,
color_base, color_format); color_base, color_format);
tex = ImTextureID(color_target); tex = ImTextureID(color_target);
if (ImGui::ImageButton(tex, button_size, ImVec2(0, 0), if (ImGui::ImageButton("#color_image", tex, button_size, ImVec2(0, 0),
ImVec2(1, 1))) { ImVec2(1, 1))) {
// show viewer // show viewer
} }
} else { } else {
ImGui::ImageButton(ImTextureID(0), button_size, ImVec2(0, 0), ImGui::ImageButton("#color_image", ImTextureID(0), button_size,
ImVec2(1, 1), -1, ImVec4(0, 0, 0, 0), ImVec2(0, 0), ImVec2(1, 1), ImVec4(0, 0, 0, 0),
ImVec4(0, 0, 0, 0)); ImVec4(0, 0, 0, 0));
} }
ImGui::PopID();
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text("Color Target %d (%s), base %.4X, pitch %d, format %s", i, ImGui::Text("Color Target %d (%s), base %.4X, pitch %d, format %s", i,
@ -1593,8 +1595,8 @@ void TraceViewer::DrawStateUI() {
auto button_pos = ImGui::GetCursorScreenPos(); auto button_pos = ImGui::GetCursorScreenPos();
ImVec2 button_size(256, 256); ImVec2 button_size(256, 256);
ImGui::ImageButton(ImTextureID(depth_target), button_size, ImVec2(0, 0), ImGui::ImageButton("#depth_stencil_image", ImTextureID(depth_target),
ImVec2(1, 1)); button_size, ImVec2(0, 0), ImVec2(1, 1));
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::BeginTooltip(); ImGui::BeginTooltip();