Mesa (master): gallium/util: remove unused debug_print_foo helpers

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Feb 25 00:02:13 UTC 2020


Module: Mesa
Branch: master
Commit: 36515e295c390edd713d92ce3aef35730a7d12e1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=36515e295c390edd713d92ce3aef35730a7d12e1

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Feb 19 12:46:25 2020 +0100

gallium/util: remove unused debug_print_foo helpers

These are unused, so let's just get rid of them.

Reviewed-by: Eric Anholt <eric at anholt.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3901>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3901>

---

 src/gallium/auxiliary/Makefile.sources       |   2 -
 src/gallium/auxiliary/meson.build            |   2 -
 src/gallium/auxiliary/util/u_debug_gallium.c | 100 ---------------------------
 src/gallium/auxiliary/util/u_debug_gallium.h |  55 ---------------
 4 files changed, 159 deletions(-)

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 88b5d418499..ca2273e63a6 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -216,8 +216,6 @@ C_SOURCES := \
 	util/u_cache.h \
 	util/u_compute.c \
 	util/u_compute.h \
-	util/u_debug_gallium.h \
-	util/u_debug_gallium.c \
 	util/u_debug_describe.c \
 	util/u_debug_describe.h \
 	util/u_debug_flush.c \
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 62c00fc26ba..62f7b468d5c 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -236,8 +236,6 @@ files_libgallium = files(
   'util/u_cache.h',
   'util/u_compute.c',
   'util/u_compute.h',
-  'util/u_debug_gallium.h',
-  'util/u_debug_gallium.c',
   'util/u_debug_describe.c',
   'util/u_debug_describe.h',
   'util/u_debug_flush.c',
diff --git a/src/gallium/auxiliary/util/u_debug_gallium.c b/src/gallium/auxiliary/util/u_debug_gallium.c
deleted file mode 100644
index 24f0e9be165..00000000000
--- a/src/gallium/auxiliary/util/u_debug_gallium.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * Copyright (c) 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-
-#include "util/u_debug.h"
-#include "u_debug_gallium.h"
-#include "u_dump.h"
-#include "util/format/u_format.h"
-
-#ifdef DEBUG
-
-/**
- * Print PIPE_TRANSFER_x flags with a message.
- */
-void
-debug_print_transfer_flags(const char *msg, unsigned usage)
-{
-   debug_printf("%s: ", msg);
-   util_dump_transfer_usage(stdout, usage);
-   printf("\n");
-}
-
-
-/**
- * Print PIPE_BIND_x flags with a message.
- */
-void
-debug_print_bind_flags(const char *msg, unsigned usage)
-{
-   static const struct debug_named_value names[] = {
-      DEBUG_NAMED_VALUE(PIPE_BIND_DEPTH_STENCIL),
-      DEBUG_NAMED_VALUE(PIPE_BIND_RENDER_TARGET),
-      DEBUG_NAMED_VALUE(PIPE_BIND_BLENDABLE),
-      DEBUG_NAMED_VALUE(PIPE_BIND_SAMPLER_VIEW),
-      DEBUG_NAMED_VALUE(PIPE_BIND_VERTEX_BUFFER),
-      DEBUG_NAMED_VALUE(PIPE_BIND_INDEX_BUFFER),
-      DEBUG_NAMED_VALUE(PIPE_BIND_CONSTANT_BUFFER),
-      DEBUG_NAMED_VALUE(PIPE_BIND_DISPLAY_TARGET),
-      DEBUG_NAMED_VALUE(PIPE_BIND_STREAM_OUTPUT),
-      DEBUG_NAMED_VALUE(PIPE_BIND_CURSOR),
-      DEBUG_NAMED_VALUE(PIPE_BIND_CUSTOM),
-      DEBUG_NAMED_VALUE(PIPE_BIND_GLOBAL),
-      DEBUG_NAMED_VALUE(PIPE_BIND_SHADER_BUFFER),
-      DEBUG_NAMED_VALUE(PIPE_BIND_SHADER_IMAGE),
-      DEBUG_NAMED_VALUE(PIPE_BIND_COMPUTE_RESOURCE),
-      DEBUG_NAMED_VALUE(PIPE_BIND_COMMAND_ARGS_BUFFER),
-      DEBUG_NAMED_VALUE(PIPE_BIND_SCANOUT),
-      DEBUG_NAMED_VALUE(PIPE_BIND_SHARED),
-      DEBUG_NAMED_VALUE(PIPE_BIND_LINEAR),
-      DEBUG_NAMED_VALUE_END
-   };
-
-   debug_printf("%s: %s\n", msg, debug_dump_flags(names, usage));
-}
-
-
-/**
- * Print PIPE_USAGE_x enum values with a message.
- */
-void
-debug_print_usage_enum(const char *msg, enum pipe_resource_usage usage)
-{
-   static const struct debug_named_value names[] = {
-      DEBUG_NAMED_VALUE(PIPE_USAGE_DEFAULT),
-      DEBUG_NAMED_VALUE(PIPE_USAGE_IMMUTABLE),
-      DEBUG_NAMED_VALUE(PIPE_USAGE_DYNAMIC),
-      DEBUG_NAMED_VALUE(PIPE_USAGE_STREAM),
-      DEBUG_NAMED_VALUE(PIPE_USAGE_STAGING),
-      DEBUG_NAMED_VALUE_END
-   };
-
-   debug_printf("%s: %s\n", msg, debug_dump_enum(names, usage));
-}
-
-#endif
diff --git a/src/gallium/auxiliary/util/u_debug_gallium.h b/src/gallium/auxiliary/util/u_debug_gallium.h
deleted file mode 100644
index f5593406ad6..00000000000
--- a/src/gallium/auxiliary/util/u_debug_gallium.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 VMware, Inc.
- * Copyright (c) 2008 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-#ifndef _U_DEBUG_GALLIUM_H_
-#define _U_DEBUG_GALLIUM_H_
-
-#include "pipe/p_defines.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef DEBUG
-
-void
-debug_print_transfer_flags(const char *msg, unsigned usage);
-
-void
-debug_print_bind_flags(const char *msg, unsigned usage);
-
-void
-debug_print_usage_enum(const char *msg, enum pipe_resource_usage usage);
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif



More information about the mesa-commit mailing list