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

Merge pull request #475 from sephiroth99/varfix 

VS2015 Update 1 fix + GLContext small cleanup
This commit is contained in:
Ben Vanik 2015-12-03 22:39:19 -08:00
parent 00240945fe e8296a8608
commit 4bac581d01
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenia/debug/ui/debug_window.cc
View File

@ -1245,13 +1245,13 @@ void DebugWindow::DrawBreakpointsPane() {
if (has_any_call_filter && !call_rankings[i].second) { if (has_any_call_filter && !call_rankings[i].second) {
continue; continue;
} }
auto export = all_exports[call_rankings[i].first]; auto export_entry = all_exports[call_rankings[i].first];
if (export->type != cpu::Export::Type::kFunction || if (export_entry->type != cpu::Export::Type::kFunction ||
!export->is_implemented()) { !export_entry->is_implemented()) {
continue; continue;
} }
// TODO(benvanik): skip unused kernel calls. // TODO(benvanik): skip unused kernel calls.
ImGui::PushID(export); ImGui::PushID(export_entry);
// TODO(benvanik): selection, hover info (module name, ordinal, etc). // TODO(benvanik): selection, hover info (module name, ordinal, etc).
bool is_pre_enabled = false; bool is_pre_enabled = false;
bool is_post_enabled = false; bool is_post_enabled = false;
@ -1275,7 +1275,7 @@ void DebugWindow::DrawBreakpointsPane() {
ImGui::SameLine(); ImGui::SameLine();
ImGui::Dummy(ImVec2(4, 0)); ImGui::Dummy(ImVec2(4, 0));
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text(export->name); ImGui::Text(export_entry->name);
ImGui::Dummy(ImVec2(0, 1)); ImGui::Dummy(ImVec2(0, 1));
ImGui::PopID(); ImGui::PopID();
} }

2
src/xenia/ui/gl/gl_context.cc
View File

@ -463,7 +463,7 @@ void GLContext::BeginSwap() {
void GLContext::EndSwap() { void GLContext::EndSwap() {
SCOPE_profile_cpu_i("gpu", "xe::ui::gl::GLContext::EndSwap"); SCOPE_profile_cpu_i("gpu", "xe::ui::gl::GLContext::EndSwap");
SwapBuffers(dc()); SwapBuffers(dc_);
} }
} // namespace gl } // namespace gl

2
src/xenia/ui/gl/gl_context.h
View File

@ -35,8 +35,6 @@ class GLContext : public GraphicsContext {
public: public:
~GLContext() override; ~GLContext() override;
HDC dc() const { return dc_; }
ImmediateDrawer* immediate_drawer() override; ImmediateDrawer* immediate_drawer() override;
bool is_current() override; bool is_current() override;