XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
(cherry picked from commit 97173d4eda142c73bb975cc05225b791778f85af)
This commit is contained in:
		
							parent
							
								
									52accec7db
								
							
						
					
					
						commit
						f1fec6f323
					
				| 
						 | 
					@ -228,8 +228,6 @@ static Bool DarwinAddScreen(int index, ScreenPtr pScreen, int argc, char **argv)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    miSetPixmapDepths();
 | 
					    miSetPixmapDepths();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    setVisualConfigs();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    // machine independent screen init
 | 
					    // machine independent screen init
 | 
				
			||||||
    // setup _Screen structure in pScreen
 | 
					    // setup _Screen structure in pScreen
 | 
				
			||||||
    if (monitorResolution)
 | 
					    if (monitorResolution)
 | 
				
			||||||
| 
						 | 
					@ -594,6 +592,10 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
 | 
				
			||||||
    for (i = 0; i < NUMFORMATS; i++)
 | 
					    for (i = 0; i < NUMFORMATS; i++)
 | 
				
			||||||
        pScreenInfo->formats[i] = formats[i];
 | 
					        pScreenInfo->formats[i] = formats[i];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef GLXEXT
 | 
				
			||||||
 | 
					    setVisualConfigs();    
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Discover screens and do mode specific initialization
 | 
					    // Discover screens and do mode specific initialization
 | 
				
			||||||
    QuartzInitOutput(argc, argv);
 | 
					    QuartzInitOutput(argc, argv);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue