diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 20:14:51 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 20:14:51 -0700 |
| commit | 61f87a75f2bcda939a1778d39be8cfa5c886e6d8 (patch) | |
| tree | b8e23a8752337b9ae60d585c2e148b71e35ffd7f /glx | |
| parent | 0d2153a46cc72d5f2e6a9081a3cf153aa3eb7787 (diff) | |
| parent | 72d914335c9ad0e0f4a34b9f7e2901b830c499bf (diff) | |
Merge remote-tracking branch 'jturney/master'
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/Makefile.am | 6 | ||||
| -rw-r--r-- | glx/glxscreens.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/glx/Makefile.am b/glx/Makefile.am index 7cc2521d5..34be4ae49 100644 --- a/glx/Makefile.am +++ b/glx/Makefile.am @@ -48,9 +48,7 @@ glapi_sources = \ glthread.c \ glthread.h -libglxdri_la_SOURCES = \ - extension_string.c \ - extension_string.h +libglxdri_la_SOURCES = if DRI libglxdri_la_SOURCES += glxdri.c @@ -65,6 +63,8 @@ libglxdri_la_LIBADD = $(DLOPEN_LIBS) libglx_la_SOURCES = \ $(indirect_sources) \ $(glapi_sources) \ + extension_string.c \ + extension_string.h \ indirect_util.c \ indirect_util.h \ indirect_program.c \ diff --git a/glx/glxscreens.c b/glx/glxscreens.c index 496cf9e14..c4ad42648 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -395,8 +395,15 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) if (depth == pScreen->visuals[i].nplanes) break; } + /* if it can't, fix up the fbconfig to not advertise window support */ if (i == pScreen->numVisuals) + config->drawableType &= ~(GLX_WINDOW_BIT); + + /* fbconfig must support window drawables */ + if (!(config->drawableType & GLX_WINDOW_BIT)) { + config->visualID = 0; continue; + } /* Create a new X visual for our FBconfig. */ visual = AddScreenVisuals(pScreen, 1, depth); |