fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ImGui] Fix deprecated SetCursorPos use

Browse Source
This commit is contained in:
Joel Linn
2022-11-20 19:43:40 +01:00
committed by Rick Gibbed
parent 29985f69e1
commit d6b5cbd634
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -821,8 +821,7 @@ void TraceViewer::DrawVertexFetcher(Shader* shader,
int display_start, display_end; int display_start, display_end;
ImGui::CalcListClipping(vertex_count, ImGui::GetTextLineHeight(), ImGui::CalcListClipping(vertex_count, ImGui::GetTextLineHeight(),
&display_start, &display_end); &display_start, &display_end);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::Dummy(ImVec2(0, (display_start)*ImGui::GetTextLineHeight()));
(display_start)*ImGui::GetTextLineHeight());
ImGui::Columns(column_count); ImGui::Columns(column_count);
if (display_start <= 1) { if (display_start <= 1) {
for (size_t el_index = 0; el_index < vertex_binding.attributes.size(); for (size_t el_index = 0; el_index < vertex_binding.attributes.size();
@@ -1009,8 +1008,8 @@ void TraceViewer::DrawVertexFetcher(Shader* shader,
} }
} }
ImGui::Columns(1); ImGui::Columns(1);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (vertex_count - display_end) * ImGui::Dummy(
ImGui::GetTextLineHeight()); ImVec2(0, (vertex_count - display_end) * ImGui::GetTextLineHeight()));
ImGui::PopStyleVar(); ImGui::PopStyleVar();
ImGui::EndChild(); ImGui::EndChild();
} }
@@ -1648,8 +1647,7 @@ void TraceViewer::DrawStateUI() {
ImGui::CalcListClipping(int(vertices.size() / 4), ImGui::CalcListClipping(int(vertices.size() / 4),
ImGui::GetTextLineHeight(), &display_start, ImGui::GetTextLineHeight(), &display_start,
&display_end); &display_end);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::Dummy(ImVec2(0, (display_start)*ImGui::GetTextLineHeight()));
(display_start)*ImGui::GetTextLineHeight());
ImGui::Columns(int(el_size), "#vsvertices", true); ImGui::Columns(int(el_size), "#vsvertices", true);
for (size_t i = display_start; i < display_end; i++) { for (size_t i = display_start; i < display_end; i++) {
@@ -1670,9 +1668,8 @@ void TraceViewer::DrawStateUI() {
} }
ImGui::Columns(1); ImGui::Columns(1);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::Dummy(ImVec2(0, ((vertices.size() / 4) - display_end) *
((vertices.size() / 4) - display_end) * ImGui::GetTextLineHeight()));
ImGui::GetTextLineHeight());
ImGui::EndChild(); ImGui::EndChild();
} else { } else {
ImGui::Text("No vertex shader output"); ImGui::Text("No vertex shader output");
@@ -1716,8 +1713,7 @@ void TraceViewer::DrawStateUI() {
ImGui::CalcListClipping(1 + draw_info.index_count, ImGui::CalcListClipping(1 + draw_info.index_count,
ImGui::GetTextLineHeight(), &display_start, ImGui::GetTextLineHeight(), &display_start,
&display_end); &display_end);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::Dummy(ImVec2(0, (display_start)*ImGui::GetTextLineHeight()));
(display_start)*ImGui::GetTextLineHeight());
ImGui::Columns(2, "#indices", true); ImGui::Columns(2, "#indices", true);
ImGui::SetColumnOffset(1, 60); ImGui::SetColumnOffset(1, 60);
if (display_start <= 1) { if (display_start <= 1) {
@@ -1752,9 +1748,8 @@ void TraceViewer::DrawStateUI() {
ImGui::NextColumn(); ImGui::NextColumn();
} }
ImGui::Columns(1); ImGui::Columns(1);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::Dummy(ImVec2(0, (draw_info.index_count - display_end) *
(draw_info.index_count - display_end) * ImGui::GetTextLineHeight()));
ImGui::GetTextLineHeight());
ImGui::PopStyleVar(); ImGui::PopStyleVar();
ImGui::EndChild(); ImGui::EndChild();
} }