diff options
| author | George Peter Staplin <gps@Georges-Workstation.local> | 2008-10-23 17:40:23 -0600 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-10-23 19:22:16 -0700 |
| commit | 6a2693b2f9cfdec6f30e2ca4c4176f986f97249e (patch) | |
| tree | 03f0edd8ace56029aee62f0dd3ce3c1c7b92cbdb | |
| parent | b015a021b28623b7b734833dc9b8269c41db4e8a (diff) | |
XQuartz: Remove the enable_stereo default. We now use feature detection to enable stereo visuals.
We need to revisit the GL/indirect.c changes. I think indirect.c should
be using the same feature detection and GLX visual config code. The
indirect changes will require testing...
(cherry picked from commit 49b7a7c6f20ca85d4d624444eb83db2f91344591)
| -rw-r--r-- | hw/xquartz/GL/visualConfigs.c | 6 | ||||
| -rw-r--r-- | hw/xquartz/X11Application.h | 1 | ||||
| -rw-r--r-- | hw/xquartz/X11Application.m | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c index e46d628de..a28754206 100644 --- a/hw/xquartz/GL/visualConfigs.c +++ b/hw/xquartz/GL/visualConfigs.c @@ -56,8 +56,6 @@ #include "capabilities.h" #include "visualConfigs.h" -extern BOOL enable_stereo; - /* Based originally on code from indirect.c which was based on code from i830_dri.c. */ void setVisualConfigs(void) { int numConfigs = 0; @@ -87,7 +85,7 @@ void setVisualConfigs(void) { 2 iterations for accum (on and off (with an accum color size of 16)). */ - numConfigs = ((enable_stereo && caps->stereo) ? 2 : 1) * 2 * + numConfigs = (caps->stereo ? 2 : 1) * 2 * (caps->aux_buffers ? 2 : 1) * (caps->buffers) * 2 * 2; visualConfigs = xcalloc(sizeof(*visualConfigs), numConfigs); @@ -107,7 +105,7 @@ void setVisualConfigs(void) { i = 0; /* current buffer */ - for (stereo = 0; stereo < ((enable_stereo && caps->stereo) ? 2 : 1); ++stereo) { + for (stereo = 0; stereo < (caps->stereo ? 2 : 1); ++stereo) { for (depth = 0; depth < 2; ++depth) { for (aux = 0; aux < (caps->aux_buffers ? 2 : 1); ++aux) { for (buffers = 0; buffers < caps->buffers; ++buffers) { diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h index 4335abc7d..dd25fb070 100644 --- a/hw/xquartz/X11Application.h +++ b/hw/xquartz/X11Application.h @@ -94,7 +94,6 @@ extern int quartzHasRoot, quartzEnableRootless; #define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers" #define PREFS_ROOTLESS "rootless" #define PREFS_XP_OPTIONS "xp_options" -#define PREFS_ENABLE_STEREO "enable_stereo" #define PREFS_LOGIN_SHELL "login_shell" #define PREFS_CLICK_THROUGH "wm_click_through" #define PREFS_FFM "wm_ffm" diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 00c2c3c74..ff202e339 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -65,7 +65,6 @@ int quartzHasRoot = FALSE, quartzEnableRootless = TRUE; static TISInputSourceRef last_key_layout; extern int darwinFakeButtons; -extern Bool enable_stereo; X11Application *X11App; @@ -676,8 +675,6 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) { darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH default:darwinDesiredDepth]; - enable_stereo = [self prefs_get_boolean:@PREFS_ENABLE_STEREO - default:enable_stereo]; } /* This will end up at the end of the responder chain. */ |