From f45bf97f30f2feacf8f976271a43feea70e5c382 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 22 Jun 2015 16:30:04 -0700 Subject: [PATCH] i965/fs: Make no16 non-variadic We never used the fact that it was variadic anyway. Reviewed-by: Chris Forbes Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_fs.cpp | 14 ++++---------- src/mesa/drivers/dri/i965/brw_fs.h | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 6a02ab9e12b..5d18dda4676 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -703,26 +703,20 @@ fs_visitor::fail(const char *format, ...) * During a SIMD16 compile (if one happens anyway), this just calls fail(). */ void -fs_visitor::no16(const char *format, ...) +fs_visitor::no16(const char *msg) { - va_list va; - - va_start(va, format); - if (dispatch_width == 16) { - vfail(format, va); + fail("%s", msg); } else { simd16_unsupported = true; if (brw->perf_debug) { if (no16_msg) - ralloc_vasprintf_append(&no16_msg, format, va); + ralloc_strcat(&no16_msg, msg); else - no16_msg = ralloc_vasprintf(mem_ctx, format, va); + no16_msg = ralloc_strdup(mem_ctx, msg); } } - - va_end(va); } /** diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index 1d52ff0d80d..cffedc0c6d1 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -157,7 +157,7 @@ public: fs_inst *inst); void vfail(const char *msg, va_list args); void fail(const char *msg, ...); - void no16(const char *msg, ...); + void no16(const char *msg); void lower_uniform_pull_constant_loads(); bool lower_load_payload(); bool lower_integer_multiplication(); -- 2.30.2