[Mesa-dev] [PATCH 01/16] nouveau_vieux: add the possibility to set options via drirc

[Martin Peres]

It is currently useless but it will be used very soon!

Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
---
 src/mesa/drivers/dri/nouveau/Makefile.am       |  1 +
 src/mesa/drivers/dri/nouveau/nouveau_context.c | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index 61af95a..ba7a23c 100644
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -36,6 +36,7 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/gallium/include \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
+	-I$(top_builddir)/src/mesa/drivers/dri/common \
 	$(DEFINES) \
 	$(VISIBILITY_CFLAGS) \
 	$(NOUVEAU_CFLAGS)
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index a049d9b..383cb90 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -48,6 +48,17 @@
 #include "tnl/tnl.h"
 #include "tnl/t_context.h"
 
+#include "xmlpool.h"
+
+static const __DRIconfigOptionsExtension nouveau_vieux_config_options = {
+   .base = { __DRI_CONFIG_OPTIONS, 1 },
+   .xml =
+
+DRI_CONF_BEGIN
+   /* will be filled later with cross-driver options */
+DRI_CONF_END
+};
+
 GLboolean
 nouveau_context_create(gl_api api,
 		       const struct gl_config *visual, __DRIcontext *dri_ctx,
@@ -114,6 +125,8 @@ nouveau_context_init(struct gl_context *ctx, gl_api api,
 {
 	struct nouveau_context *nctx = to_nouveau_context(ctx);
 	struct dd_function_table functions;
+	driOptionCache optionCache;
+
 	int ret;
 
 	nctx->screen = screen;
@@ -126,6 +139,11 @@ nouveau_context_init(struct gl_context *ctx, gl_api api,
 	nouveau_texture_functions_init(&functions);
 	nouveau_fbo_functions_init(&functions);
 
+	/* parse information in __driConfigOptions */
+	driParseOptionInfo(&optionCache,
+			   nouveau_vieux_config_options.xml);
+	driDestroyOptionInfo(&optionCache);
+
 	/* Initialize the mesa context. */
 	if (!_mesa_initialize_context(ctx, api, visual, share_ctx, &functions))
 		return GL_FALSE;
-- 
2.4.2