util: rename xmlpool.h to driconf.h
To make it clearer what it is and does. Signed-off-by: Eric Engestrom <eric@engestrom.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5440>
This commit is contained in:

committed by
Marge Bot

parent
2ef983dca6
commit
04e8eaf4e8
@@ -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,
|
||||
|
@@ -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
|
||||
|
@@ -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>
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
@@ -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
|
||||
|
@@ -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>
|
||||
|
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
@@ -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 = {
|
||||
|
@@ -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"
|
||||
|
@@ -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().
|
||||
*/
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
||||
|
||||
|
||||
|
@@ -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"
|
||||
|
@@ -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;
|
||||
|
@@ -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 ) \
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
||||
|
||||
|
||||
|
@@ -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"
|
||||
|
||||
|
@@ -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
|
@@ -230,7 +230,7 @@ def main(input_filenames):
|
||||
/*
|
||||
Use as:
|
||||
|
||||
#include "xmlpool.h"
|
||||
#include "driconf.h"
|
||||
|
||||
static const char driinfo_xml[] =
|
||||
#include "this_file"
|
||||
|
Reference in New Issue
Block a user