frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)
This commit is contained in:
George Peter Staplin 2008-10-23 17:40:23 -06:00 committed by Jeremy Huddleston
parent b015a021b2
commit 6a2693b2f9
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/GL/visualConfigs.c
View File

@ -56,8 +56,6 @@
#include "capabilities.h" #include "capabilities.h"
#include "visualConfigs.h" #include "visualConfigs.h"
extern BOOL enable_stereo;
/* Based originally on code from indirect.c which was based on code from i830_dri.c. */ /* Based originally on code from indirect.c which was based on code from i830_dri.c. */
void setVisualConfigs(void) { void setVisualConfigs(void) {
int numConfigs = 0; int numConfigs = 0;
@ -87,7 +85,7 @@ void setVisualConfigs(void) {
2 iterations for accum (on and off (with an accum color size of 16)). 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; (caps->aux_buffers ? 2 : 1) * (caps->buffers) * 2 * 2;
visualConfigs = xcalloc(sizeof(*visualConfigs), numConfigs); visualConfigs = xcalloc(sizeof(*visualConfigs), numConfigs);
@ -107,7 +105,7 @@ void setVisualConfigs(void) {
i = 0; /* current buffer */ 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 (depth = 0; depth < 2; ++depth) {
for (aux = 0; aux < (caps->aux_buffers ? 2 : 1); ++aux) { for (aux = 0; aux < (caps->aux_buffers ? 2 : 1); ++aux) {
for (buffers = 0; buffers < caps->buffers; ++buffers) { for (buffers = 0; buffers < caps->buffers; ++buffers) {

1
hw/xquartz/X11Application.h
View File

@ -94,7 +94,6 @@ extern int quartzHasRoot, quartzEnableRootless;
#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers" #define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"
#define PREFS_ROOTLESS "rootless" #define PREFS_ROOTLESS "rootless"
#define PREFS_XP_OPTIONS "xp_options" #define PREFS_XP_OPTIONS "xp_options"
#define PREFS_ENABLE_STEREO "enable_stereo"
#define PREFS_LOGIN_SHELL "login_shell" #define PREFS_LOGIN_SHELL "login_shell"
#define PREFS_CLICK_THROUGH "wm_click_through" #define PREFS_CLICK_THROUGH "wm_click_through"
#define PREFS_FFM "wm_ffm" #define PREFS_FFM "wm_ffm"

3
hw/xquartz/X11Application.m
View File

@ -65,7 +65,6 @@ int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
static TISInputSourceRef last_key_layout; static TISInputSourceRef last_key_layout;
extern int darwinFakeButtons; extern int darwinFakeButtons;
extern Bool enable_stereo;
X11Application *X11App; X11Application *X11App;
@ -676,8 +675,6 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
default:darwinDesiredDepth]; 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. */ /* This will end up at the end of the responder chain. */