Skip to content

Commit

Permalink
Resolves bgirard#66 - Display bhr markers
Browse files Browse the repository at this point in the history
  • Loading branch information
David Rajchenbach-Teller committed Jan 25, 2016
1 parent 7b5076a commit 3349db3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion js/histogram.js
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,11 @@ var HistogramContainer;
// markers are combined if they are at the same time
var lastMarkerTime = -1;
if (this.markers) {
const MARKER_TYPES_TO_DISPLAY = ["stack", "bhr"];
for (var j = 0; j < this.markers.length; j++) {
var marker = this.markers[j];
// ignore markers that have data/category (waterfall markers)
if (marker.type == "stack" || !marker.data || !marker.data.category && marker.name != "gpu_timer_query") {
if (MARKER_TYPES_TO_DISPLAY.includes(marker.type) || !marker.data || !marker.data.category && marker.name != "gpu_timer_query") {
// if the previous first marker of a set and this marker are
// within the same pixel, combine them
if (lastMarkerTime != -1 && (lastMarkerTime + 5*step / barWidth > marker.time)) {
Expand Down

0 comments on commit 3349db3

Please sign in to comment.