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

Adding safety checks, disabling vendor gl extensions by default.

This commit is contained in:
Ben Vanik 2015-03-06 21:54:59 -08:00
parent 84fa131f12
commit 14c6fbfba4
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/gpu/gl4/command_processor.cc
View File

@ -144,7 +144,7 @@ void CommandProcessor::BeginTracing(const std::wstring& root_path) {
XELOGE("Frame trace pending; ignoring streaming request."); XELOGE("Frame trace pending; ignoring streaming request.");
return; return;
} }
std::wstring path = poly::join_paths(root_path, L"stream"); std::wstring path = root_path + L"stream";
trace_state_ = TraceState::kStreaming; trace_state_ = TraceState::kStreaming;
trace_writer_.Open(path); trace_writer_.Open(path);
} }

2
src/xenia/gpu/gl4/gl4_gpu.cc
View File

@ -19,7 +19,7 @@ DEFINE_bool(gl_debug_output, false, "Dump ARB_debug_output to stderr.");
DEFINE_bool(gl_debug_output_synchronous, true, DEFINE_bool(gl_debug_output_synchronous, true,
"ARB_debug_output will synchronize to be thread safe."); "ARB_debug_output will synchronize to be thread safe.");
DEFINE_bool(vendor_gl_extensions, true, DEFINE_bool(vendor_gl_extensions, false,
"Enable vendor-specific (NV, AMD, etc) GL extensions."); "Enable vendor-specific (NV, AMD, etc) GL extensions.");
DEFINE_bool(disable_framebuffer_readback, false, DEFINE_bool(disable_framebuffer_readback, false,

11
src/xenia/gpu/trace_viewer_main.cc
View File

@ -784,6 +784,10 @@ void DrawCommandListUI(xe::ui::MainWindow* window, TracePlayer& player,
static const TracePlayer::Frame* previous_frame = nullptr; static const TracePlayer::Frame* previous_frame = nullptr;
auto frame = player.current_frame(); auto frame = player.current_frame();
if (!frame) {
ImGui::End();
return;
}
bool did_seek = false; bool did_seek = false;
if (previous_frame != frame) { if (previous_frame != frame) {
did_seek = true; did_seek = true;
@ -1516,10 +1520,15 @@ void DrawPacketDisassemblerUI(xe::ui::MainWindow* window, TracePlayer& player,
return; return;
} }
auto frame = player.current_frame();
if (!frame) {
ImGui::End();
return;
}
ImGui::Text("Frame #%d", player.current_frame_index()); ImGui::Text("Frame #%d", player.current_frame_index());
ImGui::Separator(); ImGui::Separator();
ImGui::BeginChild("packet_disassembler_list"); ImGui::BeginChild("packet_disassembler_list");
auto frame = player.current_frame();
const PacketStartCommand* pending_packet = nullptr; const PacketStartCommand* pending_packet = nullptr;
auto trace_ptr = frame->start_ptr; auto trace_ptr = frame->start_ptr;
while (trace_ptr < frame->end_ptr) { while (trace_ptr < frame->end_ptr) {