Mesa (master): util: rename xmlpool.h to driconf.h
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jun 22 22:11:53 UTC 2020
Module: Mesa
Branch: master
Commit: 04e8eaf4e82270d4eea578cd6d43eb1deea05a4d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=04e8eaf4e82270d4eea578cd6d43eb1deea05a4d
Author: Eric Engestrom <eric at engestrom.ch>
Date: Fri Jun 12 11:42:32 2020 +0200
util: rename xmlpool.h to driconf.h
To make it clearer what it is and does.
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5440>
---
src/amd/vulkan/radv_device.c | 2 +-
src/egl/drivers/dri2/egl_dri2.h | 2 +-
src/gallium/auxiliary/pipe-loader/pipe_loader.c | 2 +-
src/gallium/auxiliary/postprocess/ADDING | 2 +-
src/gallium/auxiliary/target-helpers/drm_helper.h | 2 +-
src/gallium/drivers/virgl/virgl_driinfo.h.in | 2 +-
src/gallium/targets/d3dadapter9/drm.c | 2 +-
src/gallium/targets/pipe-loader/pipe_radeonsi.c | 2 +-
src/glx/dri2_glx.c | 2 +-
src/glx/dri3_priv.h | 2 +-
src/intel/vulkan/anv_device.c | 2 +-
src/loader/loader.c | 2 +-
src/loader/loader_dri3_helper.c | 2 +-
src/mesa/drivers/dri/common/dri_util.c | 2 +-
src/mesa/drivers/dri/i915/intel_screen.c | 2 +-
src/mesa/drivers/dri/i965/intel_screen.c | 2 +-
src/mesa/drivers/dri/r200/r200_context.c | 2 +-
src/mesa/drivers/dri/r200/r200_state_init.c | 2 +-
src/mesa/drivers/dri/r200/r200_tex.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_common_context.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_context.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_screen.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_state_init.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_tex.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_texture.c | 2 +-
src/util/{xmlpool.h => driconf.h} | 6 +++---
src/util/merge_driinfo.py | 2 +-
27 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 423b5b36b00..1db64cb2ac9 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -63,7 +63,7 @@
#include "util/timespec.h"
#include "util/u_atomic.h"
#include "compiler/glsl_types.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
static struct radv_timeline_point *
radv_timeline_find_point_at_least_locked(struct radv_device *device,
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index 2fc3752a783..3da538c7dc9 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -363,7 +363,7 @@ struct dri2_egl_sync {
void *fence;
};
-/* From xmlpool.h, user exposed so should be stable */
+/* From driconf.h, user exposed so should be stable */
#define DRI_CONF_VBLANK_NEVER 0
#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1
#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
index e0fb249b6f0..cfe6faddaf1 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
@@ -33,7 +33,7 @@
#include "util/u_dl.h"
#include "util/u_file.h"
#include "util/xmlconfig.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#include <string.h>
diff --git a/src/gallium/auxiliary/postprocess/ADDING b/src/gallium/auxiliary/postprocess/ADDING
index 39f2eda0022..b202c5b627e 100644
--- a/src/gallium/auxiliary/postprocess/ADDING
+++ b/src/gallium/auxiliary/postprocess/ADDING
@@ -61,7 +61,7 @@ main function as is.
---------------------------
First time outside of auxiliary/postprocess. First, add a suitable description to
-src/util/xmlpool.h.
+src/util/driconf.h.
Use the name you put into filters.h as the config option name.
With driconf aware of the option, make Gallium aware of it too. Add it to
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
index 6010631e9a6..7d8e30e0ab4 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
@@ -5,7 +5,7 @@
#include "target-helpers/inline_debug_helper.h"
#include "target-helpers/drm_helper_public.h"
#include "frontend/drm_driver.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#ifdef GALLIUM_I915
#include "i915/drm/i915_drm_public.h"
diff --git a/src/gallium/drivers/virgl/virgl_driinfo.h.in b/src/gallium/drivers/virgl/virgl_driinfo.h.in
index 8119d77a18d..2c7be56e92c 100644
--- a/src/gallium/drivers/virgl/virgl_driinfo.h.in
+++ b/src/gallium/drivers/virgl/virgl_driinfo.h.in
@@ -1,6 +1,6 @@
// DriConf options specific to virgl
// To add a new tweak:
-// 1. Define the tweak in util/xmlpool.h and also add
+// 1. Define the tweak in util/driconf.h and also add
// the tweak name as define to virgl_protocol.h
// 2. Add the tweak here with the appropriated default value
// 3. Add the code to query the tweak in virgl_create_screen
diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c
index a230475d7de..41fa71a4349 100644
--- a/src/gallium/targets/d3dadapter9/drm.c
+++ b/src/gallium/targets/d3dadapter9/drm.c
@@ -38,7 +38,7 @@
#include "d3dadapter/drm.h"
#include "util/xmlconfig.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#include "drm-uapi/drm.h"
#include <sys/ioctl.h>
diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
index f5c5770af08..d8cbe02c1b7 100644
--- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c
+++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
@@ -1,7 +1,7 @@
#include "frontend/drm_driver.h"
#include "target-helpers/inline_debug_helper.h"
#include "radeonsi/si_public.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
static struct pipe_screen *
create_screen(int fd, const struct pipe_screen_config *config)
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 774c1ee5815..af50fbe9d9c 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -50,7 +50,7 @@
#include "dri2_priv.h"
#include "loader.h"
-/* From xmlpool.h, user exposed so should be stable */
+/* From driconf.h, user exposed so should be stable */
#define DRI_CONF_VBLANK_NEVER 0
#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1
#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
index f26edabe047..dbd04c00bb4 100644
--- a/src/glx/dri3_priv.h
+++ b/src/glx/dri3_priv.h
@@ -61,7 +61,7 @@
#include "loader_dri3_helper.h"
-/* From xmlpool.h, user exposed so should be stable */
+/* From driconf.h, user exposed so should be stable */
#define DRI_CONF_VBLANK_NEVER 0
#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1
#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 97d0088bd90..13492e4d553 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -39,7 +39,7 @@
#include "util/os_file.h"
#include "util/u_atomic.h"
#include "util/u_string.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#include "git_sha1.h"
#include "vk_util.h"
#include "common/gen_aux_map.h"
diff --git a/src/loader/loader.c b/src/loader/loader.c
index 8548cbdfedb..e0b08dfa6cb 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -53,7 +53,7 @@
#define MAX_DRM_DEVICES 64
#ifdef USE_DRICONF
#include "util/xmlconfig.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#endif
#endif
diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
index 2c8cb9a9193..95f93da0e3a 100644
--- a/src/loader/loader_dri3_helper.c
+++ b/src/loader/loader_dri3_helper.c
@@ -37,7 +37,7 @@
#include "util/macros.h"
#include "drm-uapi/drm_fourcc.h"
-/* From xmlpool.h, user exposed so should be stable */
+/* From driconf.h, user exposed so should be stable */
#define DRI_CONF_VBLANK_NEVER 0
#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1
#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index e90179c7f2e..c5e8091cf80 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -43,7 +43,7 @@
#include "dri_util.h"
#include "utils.h"
#include "util/u_endian.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#include "main/mtypes.h"
#include "main/framebuffer.h"
#include "main/version.h"
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 2243b7df5da..cf134339564 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -40,7 +40,7 @@
#include "swrast/s_renderbuffer.h"
#include "utils.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#include "util/u_memory.h"
static const __DRIconfigOptionsExtension i915_config_options = {
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 45905c48ffa..b72c247bffb 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -44,7 +44,7 @@
#include "utils.h"
#include "util/disk_cache.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#include "util/u_memory.h"
#include "common/gen_defines.h"
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index f1c5e8f172b..ab0c6c9d38e 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -65,7 +65,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_span.h"
#include "utils.h"
-#include "util/xmlpool.h" /* for symbolic values of enum-type options */
+#include "util/driconf.h" /* for symbolic values of enum-type options */
/* Return various strings for glGetString().
*/
diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c
index 3d6e6559973..5c6b575ff87 100644
--- a/src/mesa/drivers/dri/r200/r200_state_init.c
+++ b/src/mesa/drivers/dri/r200/r200_state_init.c
@@ -50,7 +50,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r200_state.h"
#include "radeon_queryobj.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
/* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in
* 1.3 cmdbuffers allow all previous state to be updated as well as
diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c
index 51f4495e18a..6e51ebe5553 100644
--- a/src/mesa/drivers/dri/r200/r200_tex.c
+++ b/src/mesa/drivers/dri/r200/r200_tex.c
@@ -46,7 +46,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r200_tex.h"
#include "util/u_memory.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 47719baa575..416d2d988fe 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
#include "radeon_common.h"
-#include "util/xmlpool.h" /* for symbolic values of enum-type options */
+#include "util/driconf.h" /* for symbolic values of enum-type options */
#include "utils.h"
#include "drivers/common/meta.h"
#include "main/context.h"
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index e05b8ba2ff6..5a1c01fdd0d 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -66,7 +66,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_fog.h"
#include "utils.h"
-#include "util/xmlpool.h" /* for symbolic values of enum-type options */
+#include "util/driconf.h" /* for symbolic values of enum-type options */
extern const struct tnl_pipeline_stage _radeon_render_stage;
extern const struct tnl_pipeline_stage _radeon_tcl_stage;
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index f438654fb26..c56eba0b935 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -62,7 +62,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/* Radeon configuration
*/
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#define DRI_CONF_COMMAND_BUFFER_SIZE(def,min,max) \
DRI_CONF_OPT_BEGIN_V(command_buffer_size,int,def, # min ":" # max ) \
diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c
index ac387184f69..d1369ce0b2c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state_init.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c
@@ -44,7 +44,7 @@
#include "../r200/r200_reg.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
/* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in
* 1.3 cmdbuffers allow all previous state to be updated as well as
diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c
index c3d7affffab..6a5579b2c2b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_tex.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tex.c
@@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_tex.h"
#include "util/u_memory.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 86059c44751..e6ab7a80ecd 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -40,7 +40,7 @@
#include "main/texobj.h"
#include "drivers/common/meta.h"
-#include "util/xmlpool.h" /* for symbolic values of enum-type options */
+#include "util/driconf.h" /* for symbolic values of enum-type options */
#include "radeon_common.h"
diff --git a/src/util/xmlpool.h b/src/util/driconf.h
similarity index 99%
rename from src/util/xmlpool.h
rename to src/util/driconf.h
index 5875f46892a..7f9312241d4 100644
--- a/src/util/xmlpool.h
+++ b/src/util/driconf.h
@@ -22,7 +22,7 @@
*
*/
/**
- * \file xmlpool.h
+ * \file driconf.h
* \brief Pool of common options
* \author Felix Kuehling
*
@@ -30,8 +30,8 @@
* driConfigOptions in the drivers.
*/
-#ifndef __XMLPOOL_H
-#define __XMLPOOL_H
+#ifndef __DRICONF_H
+#define __DRICONF_H
/*
* generic macros
diff --git a/src/util/merge_driinfo.py b/src/util/merge_driinfo.py
index 0e071e5d7bf..ff993923c58 100644
--- a/src/util/merge_driinfo.py
+++ b/src/util/merge_driinfo.py
@@ -230,7 +230,7 @@ def main(input_filenames):
/*
Use as:
-#include "xmlpool.h"
+#include "driconf.h"
static const char driinfo_xml[] =
#include "this_file"
More information about the mesa-commit
mailing list