i965: Add _CACHE_ in brw_cache_id enum names.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_performance_monitor.c

diff --git a/src/mesa/drivers/dri/i965/brw_performance_monitor.c b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
index 74b6ac91cc887338d537eb5db0965b507852eac5..edfa3d2ec2abb9f6a23ce97e3842b7518794a548 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_performance_monitor.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
@@ -50,7 +50,7 @@
 #include "main/mtypes.h"
 #include "main/performance_monitor.h"
 
-#include "glsl/ralloc.h"
+#include "util/ralloc.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"
@@ -655,8 +655,7 @@ start_oa_counters(struct brw_context *brw)
       counter_format = 0b101;
       break;
    default:
-      assert(!"Tried to enable OA counters on an unsupported generation.");
-      return;
+      unreachable("Tried to enable OA counters on an unsupported generation.");
    }
 
    BEGIN_BATCH(3);
@@ -748,7 +747,7 @@ emit_mi_report_perf_count(struct brw_context *brw,
       OUT_BATCH(report_id);
       ADVANCE_BATCH();
    } else {
-      assert(!"Unsupported generation for performance counters.");
+      unreachable("Unsupported generation for performance counters.");
    }
 
    /* Reports apparently don't always get written unless we flush after. */