Mesa (master): util: Move DRI parse_debug_string() to util
Kristian Høgsberg
krh at kemper.freedesktop.org
Thu Oct 8 19:20:17 UTC 2015
Module: Mesa
Branch: master
Commit: 04158fb0f6e1148fdf155f78147cfc58b5d2b82c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=04158fb0f6e1148fdf155f78147cfc58b5d2b82c
Author: Kristian Høgsberg Kristensen <krh at bitplanet.net>
Date: Mon Oct 5 14:13:29 2015 -0700
util: Move DRI parse_debug_string() to util
We want to use intel_debug.c in code that doesn't link to dri common.
v2: Remove unnecessary stddef.h include (Topi), use util/debug.h
in all DRI driver and remove driParseDebugString() (Iago).
Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
Signed-off-by: Kristian Høgsberg Kristensen <krh at bitplanet.net>
---
src/mesa/drivers/dri/common/utils.c | 30 ---------------
src/mesa/drivers/dri/common/utils.h | 8 ----
src/mesa/drivers/dri/i915/intel_context.c | 5 ++-
src/mesa/drivers/dri/i965/intel_debug.c | 5 ++-
src/mesa/drivers/dri/radeon/radeon_context.c | 4 +-
src/mesa/drivers/dri/radeon/radeon_debug.c | 6 +--
src/util/Makefile.sources | 2 +
src/util/debug.c | 53 ++++++++++++++++++++++++++
src/util/debug.h | 46 ++++++++++++++++++++++
9 files changed, 112 insertions(+), 47 deletions(-)
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 1246bec..ae8fcab 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -41,36 +41,6 @@
#include "utils.h"
#include "dri_util.h"
-
-uint64_t
-driParseDebugString(const char *debug,
- const struct dri_debug_control *control)
-{
- uint64_t flag = 0;
-
- if (debug != NULL) {
- for (; control->string != NULL; control++) {
- if (!strcmp(debug, "all")) {
- flag |= control->flag;
-
- } else {
- const char *s = debug;
- unsigned n;
-
- for (; n = strcspn(s, ", "), *s; s += MAX2(1, n)) {
- if (strlen(control->string) == n &&
- !strncmp(control->string, s, n))
- flag |= control->flag;
- }
- }
- }
- }
-
- return flag;
-}
-
-
-
/**
* Create the \c GL_RENDERER string for DRI drivers.
*
diff --git a/src/mesa/drivers/dri/common/utils.h b/src/mesa/drivers/dri/common/utils.h
index 3760c38..f6b8d7c 100644
--- a/src/mesa/drivers/dri/common/utils.h
+++ b/src/mesa/drivers/dri/common/utils.h
@@ -32,14 +32,6 @@
#include <GL/internal/dri_interface.h>
#include "main/context.h"
-struct dri_debug_control {
- const char * string;
- uint64_t flag;
-};
-
-extern uint64_t driParseDebugString( const char * debug,
- const struct dri_debug_control * control );
-
extern unsigned driGetRendererString( char * buffer,
const char * hardware_name, GLuint agp_mode );
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 644bede..3f429f2 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -56,6 +56,7 @@
#include "intel_mipmap_tree.h"
#include "utils.h"
+#include "util/debug.h"
#include "util/ralloc.h"
int INTEL_DEBUG = (0);
@@ -290,7 +291,7 @@ intel_viewport(struct gl_context *ctx)
intelCalcViewport(ctx);
}
-static const struct dri_debug_control debug_control[] = {
+static const struct debug_control debug_control[] = {
{ "tex", DEBUG_TEXTURE},
{ "state", DEBUG_STATE},
{ "blit", DEBUG_BLIT},
@@ -512,7 +513,7 @@ intelInitContext(struct intel_context *intel,
intelInitExtensions(ctx);
- INTEL_DEBUG = driParseDebugString(getenv("INTEL_DEBUG"), debug_control);
+ INTEL_DEBUG = parse_debug_string(getenv("INTEL_DEBUG"), debug_control);
if (INTEL_DEBUG & DEBUG_BUFMGR)
dri_bufmgr_set_debug(intel->bufmgr, true);
if (INTEL_DEBUG & DEBUG_PERF)
diff --git a/src/mesa/drivers/dri/i965/intel_debug.c b/src/mesa/drivers/dri/i965/intel_debug.c
index 5a9c953..3120189 100644
--- a/src/mesa/drivers/dri/i965/intel_debug.c
+++ b/src/mesa/drivers/dri/i965/intel_debug.c
@@ -33,10 +33,11 @@
#include "intel_debug.h"
#include "utils.h"
#include "util/u_atomic.h" /* for p_atomic_cmpxchg */
+#include "util/debug.h"
uint64_t INTEL_DEBUG = 0;
-static const struct dri_debug_control debug_control[] = {
+static const struct debug_control debug_control[] = {
{ "tex", DEBUG_TEXTURE},
{ "state", DEBUG_STATE},
{ "blit", DEBUG_BLIT},
@@ -93,7 +94,7 @@ intel_debug_flag_for_shader_stage(gl_shader_stage stage)
void
brw_process_intel_debug_variable(struct intel_screen *screen)
{
- uint64_t intel_debug = driParseDebugString(getenv("INTEL_DEBUG"), debug_control);
+ uint64_t intel_debug = parse_debug_string(getenv("INTEL_DEBUG"), debug_control);
(void) p_atomic_cmpxchg(&INTEL_DEBUG, 0, intel_debug);
if (INTEL_DEBUG & DEBUG_BUFMGR)
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index a9e2ab5..5e15b46 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -341,8 +341,8 @@ r100CreateContext( gl_api api,
#if DO_DEBUG
- RADEON_DEBUG = driParseDebugString( getenv( "RADEON_DEBUG" ),
- debug_control );
+ RADEON_DEBUG = parse_debug_string( getenv( "RADEON_DEBUG" ),
+ debug_control );
#endif
tcl_mode = driQueryOptioni(&rmesa->radeon.optionCache, "tcl_mode");
diff --git a/src/mesa/drivers/dri/radeon/radeon_debug.c b/src/mesa/drivers/dri/radeon/radeon_debug.c
index 7ddba1a..383a5df 100644
--- a/src/mesa/drivers/dri/radeon/radeon_debug.c
+++ b/src/mesa/drivers/dri/radeon/radeon_debug.c
@@ -27,7 +27,7 @@
* Pauli Nieminen <suokkos at gmail.com>
*/
-#include "utils.h"
+#include "util/debug.h"
#include "radeon_common_context.h"
#include "radeon_debug.h"
@@ -35,7 +35,7 @@
#include <stdarg.h>
#include <stdio.h>
-static const struct dri_debug_control debug_control[] = {
+static const struct debug_control debug_control[] = {
{"fall", RADEON_FALLBACKS},
{"tex", RADEON_TEXTURE},
{"ioctl", RADEON_IOCTL},
@@ -61,7 +61,7 @@ radeon_debug_type_t radeon_enabled_debug_types;
void radeon_init_debug(void)
{
- radeon_enabled_debug_types = driParseDebugString(getenv("RADEON_DEBUG"), debug_control);
+ radeon_enabled_debug_types = parse_debug_string(getenv("RADEON_DEBUG"), debug_control);
radeon_enabled_debug_types |= RADEON_GENERAL;
}
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index ef38b5a..e45431d 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -1,5 +1,7 @@
MESA_UTIL_FILES := \
bitset.h \
+ debug.c \
+ debug.h \
format_srgb.h \
hash_table.c \
hash_table.h \
diff --git a/src/util/debug.c b/src/util/debug.c
new file mode 100644
index 0000000..3729ce8
--- /dev/null
+++ b/src/util/debug.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * 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, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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 <string.h>
+#include "main/macros.h"
+#include "debug.h"
+
+uint64_t
+parse_debug_string(const char *debug,
+ const struct debug_control *control)
+{
+ uint64_t flag = 0;
+
+ if (debug != NULL) {
+ for (; control->string != NULL; control++) {
+ if (!strcmp(debug, "all")) {
+ flag |= control->flag;
+
+ } else {
+ const char *s = debug;
+ unsigned n;
+
+ for (; n = strcspn(s, ", "), *s; s += MAX2(1, n)) {
+ if (strlen(control->string) == n &&
+ !strncmp(control->string, s, n))
+ flag |= control->flag;
+ }
+ }
+ }
+ }
+
+ return flag;
+}
diff --git a/src/util/debug.h b/src/util/debug.h
new file mode 100644
index 0000000..801736a
--- /dev/null
+++ b/src/util/debug.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2015 Intel Corporation
+ *
+ * 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, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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 _DEBUG_H
+#define _DEBUG_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct debug_control {
+ const char * string;
+ uint64_t flag;
+};
+
+uint64_t
+parse_debug_string(const char *debug,
+ const struct debug_control *control);
+
+#ifdef __cplusplus
+} /* extern C */
+#endif
+
+#endif /* _DEBUG_H */
More information about the mesa-commit
mailing list