intel: Make the batchbuffer flush debug more useful.

We were printing out the line triggering the flush, but a variety of
different causes just printed the line number for intel_flush()'s call
of intel_batchbuffer_flush().  Plumb the line numbers from the caller
of intel_flush() on through.

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 068b305bded18d657598286e54c8bed23ce2ff93..ecc03a21be5b541f14e19ce5f10669fd3de3c362 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -508,14 +508,14 @@ intel_flush_rendering_to_batch(struct gl_context *ctx)
 }
 
 void
-intel_flush(struct gl_context *ctx)
+_intel_flush(struct gl_context *ctx, const char *file, int line)
 {
    struct intel_context *intel = intel_context(ctx);
 
    intel_flush_rendering_to_batch(ctx);
 
    if (intel->batch.used)
-      intel_batchbuffer_flush(intel);
+      _intel_batchbuffer_flush(intel, file, line);
 }
 
 static void

diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index ca01120db6f3daf0892c521228a6deb76825f0e1..5fe8e249690ae17c7700cbc5b546b5713dd60c8b 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -506,7 +506,9 @@ extern bool intelInitContext(struct intel_context *intel,
 
 extern void intelFinish(struct gl_context * ctx);
 extern void intel_flush_rendering_to_batch(struct gl_context *ctx);
-extern void intel_flush(struct gl_context * ctx);
+extern void _intel_flush(struct gl_context * ctx, const char *file, int line);
+
+#define intel_flush(ctx) _intel_flush(ctx, __FILE__, __LINE__)
 
 extern void intelInitDriverFunctions(struct dd_function_table *functions);