diff options
| author | Kristian Høgsberg <[email protected]> | 2008-04-08 18:26:24 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2008-04-08 18:31:07 -0400 |
| commit | c016f329abb3d638442bf0b0f27d8f34ebf54f86 (patch) | |
| tree | 0d9d0e8d9d0327c70ba73bc369c9ea0b68eb3596 | |
| parent | da3e48186dc25f40925ca89b08baa5cd34143647 (diff) | |
Only convert configs if screen creation was successful.
Thanks to Adam Jackson for pointing it out.
| -rw-r--r-- | progs/demos/Makefile | 2 | ||||
| -rw-r--r-- | src/glx/x11/dri_glx.c | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile index 456bd4a2c70..01b76ad1050 100644 --- a/progs/demos/Makefile +++ b/progs/demos/Makefile @@ -13,7 +13,7 @@ OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lX11 -lXi -lXmu PROGS = \ arbfplight \ diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c index 004af0bf3c1..fd100474523 100644 --- a/src/glx/x11/dri_glx.c +++ b/src/glx/x11/dri_glx.c @@ -786,14 +786,16 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc, & driver_configs, psc); - psc->configs = - driConvertConfigs(psc->core, - psc->configs, - driver_configs); - psc->visuals = - driConvertConfigs(psc->core, - psc->visuals, - driver_configs); + if (psp) { + psc->configs = + driConvertConfigs(psc->core, + psc->configs, + driver_configs); + psc->visuals = + driConvertConfigs(psc->core, + psc->visuals, + driver_configs); + } } } } |