diff options
| author | Dodji Seketeli <dodji@openedhand.com> | 2007-09-19 15:35:51 +0200 |
|---|---|---|
| committer | Dodji Seketeli <dodji@openedhand.com> | 2007-10-02 16:55:18 +0200 |
| commit | 6a435b00003fb00930299a0e0810c93afc23a72e (patch) | |
| tree | b0bdfbdd27287f68560057fe1b4a751f45d105a9 /hw/kdrive/ephyr/ephyrglxext.c | |
| parent | 2b217fc055300d4c709dd27c4e8ec8166183993b (diff) | |
Xephyr: check presence of extensions in host X
* hw/kdrive/ephyr/hostx.c,h:
(hostx_has_xshape),
(hostx_has_glx),
(hostx_has_dri): added these new entry points
* hw/kdrive/ephyr/ephyrdriext.c:
(ephyrDRIExtensionInit):
check presence of DRI and XShape extensions before
trying to use them.
* hw/kdrive/ephyr/ephyrglxext.c:
(ephyrHijackGLXExtension):
check presence of glx extension before we use it.
Diffstat (limited to 'hw/kdrive/ephyr/ephyrglxext.c')
| -rw-r--r-- | hw/kdrive/ephyr/ephyrglxext.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/kdrive/ephyr/ephyrglxext.c b/hw/kdrive/ephyr/ephyrglxext.c index 27b2a2dc3..47c4fb1c8 100644 --- a/hw/kdrive/ephyr/ephyrglxext.c +++ b/hw/kdrive/ephyr/ephyrglxext.c @@ -81,7 +81,12 @@ ephyrHijackGLXExtension (void) { const void *(*dispatch_functions)[2]; - EPHYR_LOG ("going to hijack some glx entry points ...\n") ; + if (!hostx_has_glx ()) { + EPHYR_LOG ("host X does not have GLX\n") ; + return FALSE ; + } + EPHYR_LOG ("host X does have GLX\n") ; + if (!Single_dispatch_info.dispatch_functions) { EPHYR_LOG_ERROR ("could not get dispatch functions table\n") ; return FALSE ; |