Zitat von Michel Dänzer <mic...@daenzer.net>:

diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
index e23c1bc..73ac43b 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.c
+++ b/src/gallium/state_trackers/dri/common/dri_context.c
@@ -37,6 +37,7 @@

 #include "pipe/p_context.h"
 #include "state_tracker/st_context.h"
+#include "state_tracker/drm_driver.h"

 static void
 dri_init_extensions(struct dri_context *ctx)
@@ -86,8 +87,8 @@ dri_create_context(gl_api api, const struct gl_config * visual,
    ctx->lock = screen->drmLock;

    driParseConfigFiles(&ctx->optionCache,
-                      &screen->optionCache, sPriv->myNum, "dri");
-
+ &screen->optionCache, sPriv->myNum, driver_descriptor.name);

This should probably be a separate fix.


I attached it as a patch for applying.
The rest will follow later.
>From 81aeaa355e650c316d0fd77d96e6ad06dd70a40d Mon Sep 17 00:00:00 2001
From: Carl-Philip Haensch <carl-philip.haen...@mailbox.tu-dresden.de>
Date: Fri, 20 May 2011 16:12:41 +0200
Subject: [PATCH] gallium/st: Use driver name to access driconf. This fixes 
fetching driconf options from the gallium drivers.

---
 .../state_trackers/dri/common/dri_context.c        |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/dri/common/dri_context.c 
b/src/gallium/state_trackers/dri/common/dri_context.c
index e23c1bc..d399534 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.c
+++ b/src/gallium/state_trackers/dri/common/dri_context.c
@@ -37,6 +37,7 @@
 
 #include "pipe/p_context.h"
 #include "state_tracker/st_context.h"
+#include "state_tracker/drm_driver.h"
 
 static void
 dri_init_extensions(struct dri_context *ctx)
@@ -85,8 +86,8 @@ dri_create_context(gl_api api, const struct gl_config * 
visual,
    ctx->sPriv = sPriv;
    ctx->lock = screen->drmLock;
 
-   driParseConfigFiles(&ctx->optionCache,
-                      &screen->optionCache, sPriv->myNum, "dri");
+   driParseConfigFiles(&ctx->optionCache, &screen->optionCache, 
+                        sPriv->myNum, driver_descriptor.name);
 
    dri_fill_st_visual(&attribs.visual, screen, visual);
    ctx->st = stapi->create_context(stapi, &screen->base, &attribs, st_share);
-- 
1.7.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to