From 1df5a6c71ee4a3c08b5da3f8bae24880af16b74c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 15 Apr 2015 13:40:55 +0100 Subject: mesa; add a dummy _mesa_error_no_memory() symbol to libglsl_util Rather than forcing everyone to provide their own definition of the symbol provide a common (dummy) one. This helps us resolve the build of the standalone pipe-drivers (amongst others), which are missing the symbol. Cc: Rob Clark Cc: "10.6" Signed-off-by: Emil Velikov --- src/gallium/drivers/freedreno/ir3/ir3_cmdline.c | 8 -------- src/gallium/state_trackers/xa/xa_tracker.c | 12 ------------ 2 files changed, 20 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c index d0517aab8ce..0b16cc1eb54 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c @@ -360,11 +360,3 @@ int main(int argc, char **argv) } dump_info(&v, info); } - -void _mesa_error_no_memory(const char *caller); - -void -_mesa_error_no_memory(const char *caller) -{ - fprintf(stderr, "Mesa error: out of memory in %s", caller); -} diff --git a/src/gallium/state_trackers/xa/xa_tracker.c b/src/gallium/state_trackers/xa/xa_tracker.c index 89019988d57..f69ac8edf27 100644 --- a/src/gallium/state_trackers/xa/xa_tracker.c +++ b/src/gallium/state_trackers/xa/xa_tracker.c @@ -535,15 +535,3 @@ xa_surface_format(const struct xa_surface *srf) { return srf->fdesc.xa_format; } - -/* - * _mesa_error_no_memory() is expected by NIR to be provided by the - * user. Normally this is in mesa st, but other state trackers - * must provide their own. - */ -void _mesa_error_no_memory(const char *caller); -void -_mesa_error_no_memory(const char *caller) -{ - debug_printf("Mesa error: out of memory in %s", caller); -} -- cgit v1.2.3