summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/d3dadapter9
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2014-11-17 16:58:28 +0100
committerEmil Velikov <[email protected]>2014-11-18 02:02:54 +0000
commit948e6c522827b64cfd9b02eb3ab34e7d1f145017 (patch)
tree2734a1d64207a2cfa902d515af5877001aca32ed /src/gallium/targets/d3dadapter9
parentfdd96578ef2dfe9c4ad5aab5858036298d444a64 (diff)
nine: Add drirc options (v2)
Implements vblank_mode and throttling, which allows us change default ratio between framerate and input lag. Acked-by: Jose Fonseca <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Signed-off-by: Axel Davy <[email protected]>
Diffstat (limited to 'src/gallium/targets/d3dadapter9')
-rw-r--r--src/gallium/targets/d3dadapter9/drm.c35
1 files changed, 35 insertions, 0 deletions
diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c
index d0b72e07bc2..a58e16715c0 100644
--- a/src/gallium/targets/d3dadapter9/drm.c
+++ b/src/gallium/targets/d3dadapter9/drm.c
@@ -36,6 +36,9 @@
#include "d3dadapter/d3dadapter9.h"
#include "d3dadapter/drm.h"
+#include "xmlconfig.h"
+#include "xmlpool.h"
+
#include <libdrm/drm.h>
#include <sys/ioctl.h>
#include <fcntl.h>
@@ -49,6 +52,16 @@
(DWORD)((lo) & 0xFFFF) \
))
+const char __driConfigOptionsNine[] =
+DRI_CONF_BEGIN
+ DRI_CONF_SECTION_PERFORMANCE
+ DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_1)
+ DRI_CONF_SECTION_END
+ DRI_CONF_SECTION_NINE
+ DRI_CONF_NINE_THROTTLE(-2)
+ DRI_CONF_SECTION_END
+DRI_CONF_END;
+
/* Regarding os versions, we should not define our own as that would simply be
* weird. Defaulting to Win2k/XP seems sane considering the origin of D3D9. The
* driver also defaults to being a generic D3D9 driver, which of course only
@@ -229,6 +242,9 @@ drm_create_adapter( int fd,
int i, different_device;
const struct drm_conf_ret *throttle_ret = NULL;
const struct drm_conf_ret *dmabuf_ret = NULL;
+ driOptionCache defaultInitOptions;
+ driOptionCache userInitOptions;
+ int throttling_value_user;
#if !GALLIUM_STATIC_TARGETS
const char *paths[] = {
@@ -289,6 +305,25 @@ drm_create_adapter( int fd,
} else
ctx->base.throttling = FALSE;
+ driParseOptionInfo(&defaultInitOptions, __driConfigOptionsNine);
+ driParseConfigFiles(&userInitOptions, &defaultInitOptions, 0, "nine");
+ if (driCheckOption(&userInitOptions, "throttle_value", DRI_INT)) {
+ throttling_value_user = driQueryOptioni(&userInitOptions, "throttle_value");
+ if (throttling_value_user == -1)
+ ctx->base.throttling = FALSE;
+ else if (throttling_value_user >= 0) {
+ ctx->base.throttling = TRUE;
+ ctx->base.throttling_value = throttling_value_user;
+ }
+ }
+
+ if (driCheckOption(&userInitOptions, "vblank_mode", DRI_ENUM))
+ ctx->base.vblank_mode = driQueryOptioni(&userInitOptions, "vblank_mode");
+ else
+ ctx->base.vblank_mode = 1;
+
+ driDestroyOptionCache(&userInitOptions);
+ driDestroyOptionInfo(&defaultInitOptions);
#if GALLIUM_STATIC_TARGETS
ctx->base.ref = ninesw_create_screen(ctx->base.hal);