OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmlconfig: move into src/util

Browse Source 
v2: attempt to fix Android build (Emil)

v3: add missing include path

Reviewed-by: Marek Olšák <marek.olsak@amd.com> (v1)
This commit is contained in:
Nicolai Hähnle
2017-06-30 11:57:06 +02:00
parent 1e40d2c882
commit 601093f95d
54 changed files with 125 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -2898,7 +2898,6 @@ AC_CONFIG_FILES([Makefile
src/mesa/gl.pc src/mesa/gl.pc
src/mesa/drivers/dri/dri.pc src/mesa/drivers/dri/dri.pc
src/mesa/drivers/dri/common/Makefile src/mesa/drivers/dri/common/Makefile
src/mesa/drivers/dri/common/xmlpool/Makefile
src/mesa/drivers/dri/i915/Makefile src/mesa/drivers/dri/i915/Makefile
src/mesa/drivers/dri/i965/Makefile src/mesa/drivers/dri/i965/Makefile
src/mesa/drivers/dri/Makefile src/mesa/drivers/dri/Makefile
@@ -2912,6 +2911,7 @@ AC_CONFIG_FILES([Makefile
src/mesa/main/tests/Makefile src/mesa/main/tests/Makefile
src/util/Makefile src/util/Makefile
src/util/tests/hash_table/Makefile src/util/tests/hash_table/Makefile
src/util/xmlpool/Makefile
src/vulkan/Makefile]) src/vulkan/Makefile])
AC_OUTPUT AC_OUTPUT

2
src/gallium/state_trackers/dri/Makefile.am
View File

@@ -28,7 +28,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa \
-I$(top_builddir)/src/mesa/drivers/dri/common \ -I$(top_builddir)/src/util \
-I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
$(GALLIUM_CFLAGS) \ $(GALLIUM_CFLAGS) \
$(LIBDRM_CFLAGS) \ $(LIBDRM_CFLAGS) \

2
src/gallium/state_trackers/dri/dri_screen.c
View File

@@ -30,7 +30,7 @@
*/ */
#include "utils.h" #include "utils.h"
#include "xmlpool.h" #include "util/xmlpool.h"
#include "dri_screen.h" #include "dri_screen.h"
#include "dri_context.h" #include "dri_context.h"

2
src/gallium/state_trackers/dri/dri_screen.h
View File

@@ -33,7 +33,7 @@
#define DRI_SCREEN_H #define DRI_SCREEN_H
#include "dri_util.h" #include "dri_util.h"
#include "xmlconfig.h" #include "util/xmlconfig.h"
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
#include "pipe/p_context.h" #include "pipe/p_context.h"

1
src/gallium/targets/d3dadapter9/Makefile.am
View File

@@ -27,7 +27,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/loader \ -I$(top_srcdir)/src/loader \
-I$(top_srcdir)/src/mapi/ \ -I$(top_srcdir)/src/mapi/ \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_builddir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \ -I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/gallium/winsys \ -I$(top_srcdir)/src/gallium/winsys \
-I$(top_srcdir)/src/gallium/state_trackers/nine \ -I$(top_srcdir)/src/gallium/state_trackers/nine \

4
src/gallium/targets/d3dadapter9/drm.c
View File

@@ -37,8 +37,8 @@
#include "d3dadapter/d3dadapter9.h" #include "d3dadapter/d3dadapter9.h"
#include "d3dadapter/drm.h" #include "d3dadapter/drm.h"
#include "xmlconfig.h" #include "util/xmlconfig.h"
#include "xmlpool.h" #include "util/xmlpool.h"
#include <drm.h> #include <drm.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

4
src/loader/Makefile.am
View File

@@ -39,14 +39,14 @@ libloader_la_LIBADD =
if HAVE_DRICOMMON if HAVE_DRICOMMON
libloader_la_CPPFLAGS += \ libloader_la_CPPFLAGS += \
-I$(top_builddir)/src/mesa/drivers/dri/common/ \ -I$(top_builddir)/src/util/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \ -I$(top_srcdir)/src/mesa/drivers/dri/common/ \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mapi/ \ -I$(top_srcdir)/src/mapi/ \
-DUSE_DRICONF -DUSE_DRICONF
libloader_la_LIBADD += \ libloader_la_LIBADD += \
$(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la $(top_builddir)/src/util/libxmlconfig.la
endif endif

4
src/loader/loader.c
View File

@@ -46,8 +46,8 @@
#ifdef HAVE_LIBDRM #ifdef HAVE_LIBDRM
#include <xf86drm.h> #include <xf86drm.h>
#ifdef USE_DRICONF #ifdef USE_DRICONF
#include "xmlconfig.h" #include "util/xmlconfig.h"
#include "xmlpool.h" #include "util/xmlpool.h"
#endif #endif
#endif #endif

1
src/mesa/drivers/SConscript
View File

@@ -7,6 +7,5 @@ if env['x11']:
if env['dri']: if env['dri']:
SConscript([ SConscript([
'dri/common/xmlpool/SConscript',
'dri/common/SConscript', 'dri/common/SConscript',
]) ])

2
src/mesa/drivers/dri/Makefile.am
View File

@@ -65,7 +65,7 @@ mesa_dri_drivers_la_LIBADD = \
../../libmesa.la \ ../../libmesa.la \
common/libmegadriver_stub.la \ common/libmegadriver_stub.la \
common/libdricommon.la \ common/libdricommon.la \
common/libxmlconfig.la \ $(top_builddir)/src/util/libxmlconfig.la \
$(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
$(MEGADRIVERS_DEPS) \ $(MEGADRIVERS_DEPS) \
$(DRI_LIB_DEPS) \ $(DRI_LIB_DEPS) \

48
src/mesa/drivers/dri/common/Android.mk
View File

@@ -44,53 +44,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(intermediates) $(intermediates)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(DRI_COMMON_FILES) \ $(DRI_COMMON_FILES)
$(XMLCONFIG_FILES)
MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
LOCAL_GENERATED_SOURCES := $(MESA_DRI_OPTIONS_H)
#
# Generate options.h from gettext translations.
#
MESA_DRI_OPTIONS_LANGS := de es nl fr sv
POT := $(intermediates)/xmlpool.pot
$(POT): $(LOCAL_PATH)/xmlpool/t_options.h
@mkdir -p $(dir $@)
xgettext -L C --from-code utf-8 -o $@ $<
$(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT)
lang=$(basename $(notdir $@)); \
mkdir -p $(dir $@); \
if [ -f $< ]; then \
msgmerge -o $@ $^; \
else \
msginit -i $(POT) \
-o $@ \
--locale=$$lang \
--no-translator; \
sed -i -e 's/charset=.*\\n/charset=UTF-8\\n/' $@; \
fi
PRIVATE_SCRIPT := $(LOCAL_PATH)/xmlpool/gen_xmlpool.py
PRIVATE_LOCALEDIR := $(intermediates)/xmlpool
PRIVATE_TEMPLATE_HEADER := $(LOCAL_PATH)/xmlpool/t_options.h
PRIVATE_MO_FILES := $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%/LC_MESSAGES/options.mo)
LOCAL_GENERATED_SOURCES += $(PRIVATE_MO_FILES)
$(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%/LC_MESSAGES/options.mo: $(intermediates)/xmlpool/%.po
mkdir -p $(dir $@)
msgfmt -o $@ $<
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ $(PRIVATE_TEMPLATE_HEADER) \
$(PRIVATE_LOCALEDIR) $(MESA_DRI_OPTIONS_LANGS) > $@
$(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER) $(PRIVATE_MO_FILES)
$(transform-generated-source)
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

13
src/mesa/drivers/dri/common/Makefile.am
View File

@@ -19,11 +19,9 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE. # IN THE SOFTWARE.
SUBDIRS = xmlpool
include Makefile.sources include Makefile.sources
EXTRA_DIST = drirc xmlpool.h SConscript EXTRA_DIST = SConscript
AM_CFLAGS = \ AM_CFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
@@ -32,22 +30,15 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/util/ \
$(LIBDRM_CFLAGS) \ $(LIBDRM_CFLAGS) \
$(DEFINES) \ $(DEFINES) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
$(VISIBILITY_CFLAGS) $(VISIBILITY_CFLAGS)
noinst_LTLIBRARIES = \ noinst_LTLIBRARIES = \
libdricommon.la \ libdricommon.la \
libxmlconfig.la \
libmegadriver_stub.la libmegadriver_stub.la
libdricommon_la_SOURCES = $(DRI_COMMON_FILES) libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
libxmlconfig_la_CFLAGS = $(AM_CFLAGS) $(EXPAT_CFLAGS)
libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
libmegadriver_stub_la_SOURCES = $(megadriver_stub_FILES) libmegadriver_stub_la_SOURCES = $(megadriver_stub_FILES)
sysconf_DATA = drirc

7
src/mesa/drivers/dri/common/Makefile.sources
View File

@@ -4,10 +4,6 @@ DRI_COMMON_FILES := \
dri_util.c \ dri_util.c \
dri_util.h dri_util.h
XMLCONFIG_FILES := \
xmlconfig.c \
xmlconfig.h
# Paths are relative to MESA_TOP. # Paths are relative to MESA_TOP.
mesa_dri_common_INCLUDES := \ mesa_dri_common_INCLUDES := \
include \ include \
@@ -15,7 +11,8 @@ mesa_dri_common_INCLUDES := \
src/egl/main \ src/egl/main \
src/mapi \ src/mapi \
src/mesa \ src/mesa \
src/mesa/drivers/dri/common src/mesa/drivers/dri/common \
src/util
megadriver_stub_FILES := \ megadriver_stub_FILES := \
megadriver_stub.c megadriver_stub.c

8
src/mesa/drivers/dri/common/SConscript
View File

@@ -7,7 +7,6 @@ drienv = env.Clone()
drienv.Replace(CPPPATH = [ drienv.Replace(CPPPATH = [
'#src/mesa/drivers/dri/common', '#src/mesa/drivers/dri/common',
xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
'#include', '#include',
'#include/GL/internal', '#include/GL/internal',
'#src', '#src',
@@ -26,13 +25,10 @@ drienv.Replace(CPPPATH = [
'#src/mesa/swrast_setup', '#src/mesa/swrast_setup',
'#src/egl/main', '#src/egl/main',
'#src/egl/drivers/dri', '#src/egl/drivers/dri',
'#src/util',
]) ])
drienv.AppendUnique(LIBS = [ sources = drienv.ParseSourceList('Makefile.sources', ['DRI_COMMON_FILES'])
'expat',
])
sources = drienv.ParseSourceList('Makefile.sources', ['DRI_COMMON_FILES', 'XMLCONFIG_FILES' ])
dri_common = drienv.ConvenienceLibrary( dri_common = drienv.ConvenienceLibrary(
target = 'dri_common', target = 'dri_common',

2
src/mesa/drivers/dri/common/dri_util.c
View File

@@ -42,7 +42,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "dri_util.h" #include "dri_util.h"
#include "utils.h" #include "utils.h"
#include "xmlpool.h" #include "util/xmlpool.h"
#include "main/mtypes.h" #include "main/mtypes.h"
#include "main/framebuffer.h" #include "main/framebuffer.h"
#include "main/version.h" #include "main/version.h"

2
src/mesa/drivers/dri/common/dri_util.h
View File

@@ -56,7 +56,7 @@
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/internal/dri_interface.h> #include <GL/internal/dri_interface.h>
#include "main/mtypes.h" #include "main/mtypes.h"
#include "xmlconfig.h" #include "util/xmlconfig.h"
#include <stdbool.h> #include <stdbool.h>
/** /**

2
src/mesa/drivers/dri/i915/Makefile.am
View File

@@ -30,7 +30,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \ -I$(top_builddir)/src/util \
-I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
$(DEFINES) \ $(DEFINES) \
$(VISIBILITY_CFLAGS) \ $(VISIBILITY_CFLAGS) \

2
src/mesa/drivers/dri/i915/intel_screen.c
View File

@@ -39,7 +39,7 @@
#include "swrast/s_renderbuffer.h" #include "swrast/s_renderbuffer.h"
#include "utils.h" #include "utils.h"
#include "xmlpool.h" #include "util/xmlpool.h"
static const __DRIconfigOptionsExtension i915_config_options = { static const __DRIconfigOptionsExtension i915_config_options = {
.base = { __DRI_CONFIG_OPTIONS, 1 }, .base = { __DRI_CONFIG_OPTIONS, 1 },

2
src/mesa/drivers/dri/i915/intel_screen.h
View File

@@ -33,7 +33,7 @@
#include "dri_util.h" #include "dri_util.h"
#include "intel_bufmgr.h" #include "intel_bufmgr.h"
#include "i915_drm.h" #include "i915_drm.h"
#include "xmlconfig.h" #include "util/xmlconfig.h"
struct intel_screen struct intel_screen
{ {

2
src/mesa/drivers/dri/i965/Makefile.am
View File

@@ -30,7 +30,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \ -I$(top_builddir)/src/util \
-I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/gtest/include \ -I$(top_srcdir)/src/gtest/include \
-I$(top_builddir)/src/compiler/glsl \ -I$(top_builddir)/src/compiler/glsl \

2
src/mesa/drivers/dri/i965/intel_screen.c
View File

@@ -41,7 +41,7 @@
#include "compiler/nir/nir.h" #include "compiler/nir/nir.h"
#include "utils.h" #include "utils.h"
#include "xmlpool.h" #include "util/xmlpool.h"
#ifndef DRM_FORMAT_MOD_INVALID #ifndef DRM_FORMAT_MOD_INVALID
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1) #define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)

2
src/mesa/drivers/dri/i965/intel_screen.h
View File

@@ -36,7 +36,7 @@
#include "brw_bufmgr.h" #include "brw_bufmgr.h"
#include "common/gen_device_info.h" #include "common/gen_device_info.h"
#include "i915_drm.h" #include "i915_drm.h"
#include "xmlconfig.h" #include "util/xmlconfig.h"
#include "isl/isl.h" #include "isl/isl.h"

2
src/mesa/drivers/dri/r200/Makefile.am
View File

@@ -34,7 +34,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \ -I$(top_builddir)/src/util \
-I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \ -I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
$(DEFINES) \ $(DEFINES) \

2
src/mesa/drivers/dri/r200/r200_context.c
View File

@@ -65,7 +65,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_span.h" #include "radeon_span.h"
#include "utils.h" #include "utils.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */ #include "util/xmlpool.h" /* for symbolic values of enum-type options */
/* Return various strings for glGetString(). /* Return various strings for glGetString().
*/ */

2
src/mesa/drivers/dri/r200/r200_state_init.c
View File

@@ -49,7 +49,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r200_state.h" #include "r200_state.h"
#include "radeon_queryobj.h" #include "radeon_queryobj.h"
#include "xmlpool.h" #include "util/xmlpool.h"
/* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in /* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in
* 1.3 cmdbuffers allow all previous state to be updated as well as * 1.3 cmdbuffers allow all previous state to be updated as well as

2
src/mesa/drivers/dri/r200/r200_tex.c
View File

@@ -45,7 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r200_ioctl.h" #include "r200_ioctl.h"
#include "r200_tex.h" #include "r200_tex.h"
#include "xmlpool.h" #include "util/xmlpool.h"

2
src/mesa/drivers/dri/radeon/Makefile.am
View File

@@ -35,7 +35,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \ -I$(top_builddir)/src/util \
-I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \ -I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
$(DEFINES) \ $(DEFINES) \

2
src/mesa/drivers/dri/radeon/radeon_common_context.c
View File

@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/ **************************************************************************/
#include "radeon_common.h" #include "radeon_common.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */ #include "util/xmlpool.h" /* for symbolic values of enum-type options */
#include "utils.h" #include "utils.h"
#include "drivers/common/meta.h" #include "drivers/common/meta.h"
#include "main/context.h" #include "main/context.h"

2
src/mesa/drivers/dri/radeon/radeon_context.c
View File

@@ -67,7 +67,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_fog.h" #include "radeon_fog.h"
#include "utils.h" #include "utils.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */ #include "util/xmlpool.h" /* for symbolic values of enum-type options */
extern const struct tnl_pipeline_stage _radeon_render_stage; extern const struct tnl_pipeline_stage _radeon_render_stage;
extern const struct tnl_pipeline_stage _radeon_tcl_stage; extern const struct tnl_pipeline_stage _radeon_tcl_stage;

2
src/mesa/drivers/dri/radeon/radeon_screen.c
View File

@@ -62,7 +62,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/* Radeon configuration /* Radeon configuration
*/ */
#include "xmlpool.h" #include "util/xmlpool.h"
#define DRI_CONF_COMMAND_BUFFER_SIZE(def,min,max) \ #define DRI_CONF_COMMAND_BUFFER_SIZE(def,min,max) \
DRI_CONF_OPT_BEGIN_V(command_buffer_size,int,def, # min ":" # max ) \ DRI_CONF_OPT_BEGIN_V(command_buffer_size,int,def, # min ":" # max ) \

2
src/mesa/drivers/dri/radeon/radeon_screen.h
View File

@@ -45,7 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dri_util.h" #include "dri_util.h"
#include "radeon_chipset.h" #include "radeon_chipset.h"
#include "radeon_reg.h" #include "radeon_reg.h"
#include "xmlconfig.h" #include "util/xmlconfig.h"
typedef struct { typedef struct {

2
src/mesa/drivers/dri/radeon/radeon_state_init.c
View File

@@ -44,7 +44,7 @@
#include "../r200/r200_reg.h" #include "../r200/r200_reg.h"
#include "xmlpool.h" #include "util/xmlpool.h"
/* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in /* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in
* 1.3 cmdbuffers allow all previous state to be updated as well as * 1.3 cmdbuffers allow all previous state to be updated as well as

2
src/mesa/drivers/dri/radeon/radeon_tex.c
View File

@@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_ioctl.h" #include "radeon_ioctl.h"
#include "radeon_tex.h" #include "radeon_tex.h"
#include "xmlpool.h" #include "util/xmlpool.h"

2
src/mesa/drivers/dri/radeon/radeon_texture.c
View File

@@ -41,7 +41,7 @@
#include "main/texobj.h" #include "main/texobj.h"
#include "drivers/common/meta.h" #include "drivers/common/meta.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */ #include "util/xmlpool.h" /* for symbolic values of enum-type options */
#include "radeon_common.h" #include "radeon_common.h"

2
src/mesa/drivers/dri/swrast/Makefile.am
View File

@@ -30,7 +30,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mesa/drivers/dri/common \ -I$(top_builddir)/src/util \
-I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
$(LIBDRM_CFLAGS) \ $(LIBDRM_CFLAGS) \
$(DEFINES) \ $(DEFINES) \

54
src/util/Android.mk
View File

@@ -31,7 +31,8 @@ include $(LOCAL_PATH)/Makefile.sources
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(MESA_UTIL_FILES) $(MESA_UTIL_FILES) \
$(XMLCONFIG_FILES)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
external/zlib \ external/zlib \
@@ -47,11 +48,56 @@ LOCAL_MODULE := libmesa_util
LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-generated-sources-dir) intermediates := $(call local-generated-sources-dir)
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES)) UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H)
#
# Generate options.h from gettext translations.
#
MESA_DRI_OPTIONS_LANGS := de es nl fr sv
POT := $(intermediates)/xmlpool.pot
$(POT): $(LOCAL_PATH)/xmlpool/t_options.h
@mkdir -p $(dir $@)
xgettext -L C --from-code utf-8 -o $@ $<
$(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT)
lang=$(basename $(notdir $@)); \
mkdir -p $(dir $@); \
if [ -f $< ]; then \
msgmerge -o $@ $^; \
else \
msginit -i $(POT) \
-o $@ \
--locale=$$lang \
--no-translator; \
sed -i -e 's/charset=.*\\n/charset=UTF-8\\n/' $@; \
fi
PRIVATE_SCRIPT := $(LOCAL_PATH)/xmlpool/gen_xmlpool.py
PRIVATE_LOCALEDIR := $(intermediates)/xmlpool
PRIVATE_TEMPLATE_HEADER := $(LOCAL_PATH)/xmlpool/t_options.h
PRIVATE_MO_FILES := $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%/LC_MESSAGES/options.mo)
LOCAL_GENERATED_SOURCES += $(PRIVATE_MO_FILES)
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2) $(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
$(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%/LC_MESSAGES/options.mo: $(intermediates)/xmlpool/%.po
mkdir -p $(dir $@)
msgfmt -o $@ $<
$(UTIL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
$(UTIL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
$(transform-generated-source)
$(MESA_DRI_OPTIONS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ $(PRIVATE_TEMPLATE_HEADER) \
$(PRIVATE_LOCALEDIR) $(MESA_DRI_OPTIONS_LANGS) > $@
$(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER) $(PRIVATE_MO_FILES)
$(transform-generated-source) $(transform-generated-source)
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)

20
src/util/Makefile.am
View File

@@ -19,11 +19,13 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE. # IN THE SOFTWARE.
SUBDIRS = . tests/hash_table SUBDIRS = xmlpool . tests/hash_table
include Makefile.sources include Makefile.sources
noinst_LTLIBRARIES = libmesautil.la noinst_LTLIBRARIES = \
libmesautil.la \
libxmlconfig.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/include
@@ -46,6 +48,18 @@ libmesautil_la_SOURCES = \
libmesautil_la_LIBADD = $(ZLIB_LIBS) libmesautil_la_LIBADD = $(ZLIB_LIBS)
libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
libxmlconfig_la_CFLAGS = \
$(DEFINES) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
-DSYSCONFDIR=\"$(sysconfdir)\" \
$(VISIBILITY_CFLAGS) \
$(EXPAT_CFLAGS)
libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
sysconf_DATA = drirc
roundeven_test_LDADD = -lm roundeven_test_LDADD = -lm
check_PROGRAMS = u_atomic_test roundeven_test check_PROGRAMS = u_atomic_test roundeven_test
@@ -54,8 +68,10 @@ TESTS = $(check_PROGRAMS)
BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES) BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \ EXTRA_DIST = \
drirc \
format_srgb.py \ format_srgb.py \
SConscript \ SConscript \
xmlpool.h \
sha1/README sha1/README
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)

4
src/util/Makefile.sources
View File

@@ -56,3 +56,7 @@ MESA_UTIL_FILES := \
MESA_UTIL_GENERATED_FILES = \ MESA_UTIL_GENERATED_FILES = \
format_srgb.c format_srgb.c
XMLCONFIG_FILES := \
xmlconfig.c \
xmlconfig.h

16
src/util/SConscript
View File

@@ -2,6 +2,10 @@ import common
Import('*') Import('*')
SConscript([
'xmlpool',
])
from sys import executable as python_cmd from sys import executable as python_cmd
env = env.Clone() env = env.Clone()
@@ -10,6 +14,7 @@ env.MSVC2013Compat()
env.Prepend(CPPPATH = [ env.Prepend(CPPPATH = [
'#include', '#include',
xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
'#src', '#src',
'#src/mapi', '#src/mapi',
'#src/mesa', '#src/mesa',
@@ -30,10 +35,17 @@ source_lists = env.ParseSourceList('Makefile.sources')
mesautil_sources = ( mesautil_sources = (
source_lists['MESA_UTIL_FILES'] + source_lists['MESA_UTIL_FILES'] +
source_lists['MESA_UTIL_GENERATED_FILES'] source_lists['MESA_UTIL_GENERATED_FILES'] +
source_lists['XMLCONFIG_FILES']
) )
mesautil = env.ConvenienceLibrary( mesautilenv = env.Clone()
mesautilenv.AppendUnique(LIBS = [
'expat',
])
mesautil = mesautilenv.ConvenienceLibrary(
target = 'mesautil', target = 'mesautil',
source = mesautil_sources, source = mesautil_sources,
) )

0
src/mesa/drivers/dri/common/drirc → src/util/drirc
View File

0
src/mesa/drivers/dri/common/xmlconfig.c → src/util/xmlconfig.c
View File

0
src/mesa/drivers/dri/common/xmlconfig.h → src/util/xmlconfig.h
View File

0
src/mesa/drivers/dri/common/xmlpool.h → src/util/xmlpool.h
View File

0
src/mesa/drivers/dri/common/xmlpool/.gitignore → src/util/xmlpool/.gitignore vendored
View File

0
src/mesa/drivers/dri/common/xmlpool/Makefile.am → src/util/xmlpool/Makefile.am
View File

0
src/mesa/drivers/dri/common/xmlpool/SConscript → src/util/xmlpool/SConscript
View File

0
src/mesa/drivers/dri/common/xmlpool/ca.po → src/util/xmlpool/ca.po
View File

0
src/mesa/drivers/dri/common/xmlpool/de.po → src/util/xmlpool/de.po
View File

0
src/mesa/drivers/dri/common/xmlpool/es.po → src/util/xmlpool/es.po
View File

0
src/mesa/drivers/dri/common/xmlpool/fr.po → src/util/xmlpool/fr.po
View File

0
src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py → src/util/xmlpool/gen_xmlpool.py
View File

0
src/mesa/drivers/dri/common/xmlpool/nl.po → src/util/xmlpool/nl.po
View File

0
src/mesa/drivers/dri/common/xmlpool/sv.po → src/util/xmlpool/sv.po
View File

0
src/mesa/drivers/dri/common/xmlpool/t_options.h → src/util/xmlpool/t_options.h
View File