fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 00:38:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: Remove the enable_stereo default. We now use feature detection to enable stereo visuals.

Browse source 
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...

Same as the 1.5 branch changes.
This commit is contained in:
George Peter Staplin 2008-10-23 17:53:13 -06:00
parent 7162df3bb0
commit 508ebb7c45
3 changed files with 2 additions and 9 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 "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) {

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_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"

4
hw/xquartz/X11Application.m
View file

@ -65,7 +65,6 @@ int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
static TISInputSourceRef last_key_layout;
extern int darwinFakeButtons;
extern Bool enable_stereo;
X11Application *X11App;
@ -674,9 +673,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. */