summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Janes <mark.a.janes@intel.com>2017-09-25 21:23:10 -0700
committerMark Janes <mark.a.janes@intel.com>2017-09-25 21:23:10 -0700
commit5fd67cefc07827d689453a104a526a420085c3e8 (patch)
tree9dd187d5552a81fd5cbfa98a15093558d7a8fe59
parentafe026dd92ea31eafe3f2fa9fffbc33814f45480 (diff)
Metrics: Re-enable debugging features in the absence of metrics
Mesa developers have expressed interest in the debug features of FrameRetrace on platforms that do not yet support performance counters. Also, developers intend to add metrics support for new hardware. This work will be helped by allowing the application to run while support is added.
-rw-r--r--retrace/daemon/glframe_retrace.cpp3
-rw-r--r--retrace/daemon/ui/glframe_metrics_model.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/retrace/daemon/glframe_retrace.cpp b/retrace/daemon/glframe_retrace.cpp
index 8b66388c..0f340312 100644
--- a/retrace/daemon/glframe_retrace.cpp
+++ b/retrace/daemon/glframe_retrace.cpp
@@ -114,8 +114,7 @@ FrameRetrace::openFile(const std::string &filename,
msg << "Performance counters not enabled.\n"
"To enable counters, execute as root: "
"`/sbin/sysctl dev.i915.perf_stream_paranoid=0`";
- callback->onError(RETRACE_FATAL, msg.str());
- return;
+ callback->onError(RETRACE_WARN, msg.str());
}
assemblyOutput.init();
diff --git a/retrace/daemon/ui/glframe_metrics_model.cpp b/retrace/daemon/ui/glframe_metrics_model.cpp
index f8623147..14b0d02a 100644
--- a/retrace/daemon/ui/glframe_metrics_model.cpp
+++ b/retrace/daemon/ui/glframe_metrics_model.cpp
@@ -141,6 +141,8 @@ QMetricsModel::onMetrics(const MetricSeries &metricData,
void
QMetricsModel::onSelect(SelectionId id, QList<int> selection) {
+ if (!m_retrace)
+ return;
m_current_selection_count = id;
m_render_selection.clear();
if (selection.empty()) {