diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-04 19:52:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-04 19:52:56 +0200 |
| commit | 62ed212e1add98e39c0f7a6e5a8a5726d66f161e (patch) | |
| tree | a80c4bf566c76665b3449f13fac7de72c66aa80a /xorg-server | |
| parent | 3095a03ec3cb1f05b49362327d10a767299d7635 (diff) | |
| parent | fe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff) | |
| download | vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.tar.gz vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.tar.bz2 vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/fb/fbscreen.c | 3 | ||||
| -rw-r--r-- | xorg-server/glamor/glamor.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xorg-server/fb/fbscreen.c b/xorg-server/fb/fbscreen.c index 1f9108945..0d4d87f8b 100644 --- a/xorg-server/fb/fbscreen.c +++ b/xorg-server/fb/fbscreen.c @@ -37,7 +37,8 @@ fbCloseScreen(ScreenPtr pScreen) free(depths[d].vids); free(depths); free(pScreen->visuals); - FreePixmap((PixmapPtr)pScreen->devPrivate); + if (pScreen->devPrivate) + FreePixmap((PixmapPtr)pScreen->devPrivate); return TRUE; } diff --git a/xorg-server/glamor/glamor.c b/xorg-server/glamor/glamor.c index c398807f1..358890375 100644 --- a/xorg-server/glamor/glamor.c +++ b/xorg-server/glamor/glamor.c @@ -316,7 +316,7 @@ glamor_init(ScreenPtr screen, unsigned int flags) { glamor_screen_private *glamor_priv; int gl_version; - int max_viewport_size; + int max_viewport_size[2]; #ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(screen); @@ -408,8 +408,9 @@ glamor_init(ScreenPtr screen, unsigned int flags) glamor_priv->has_buffer_storage = epoxy_has_gl_extension("GL_ARB_buffer_storage"); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &glamor_priv->max_fbo_size); - glGetIntegerv(GL_MAX_VIEWPORT_DIMS, &max_viewport_size); - glamor_priv->max_fbo_size = MIN(glamor_priv->max_fbo_size, max_viewport_size); + glGetIntegerv(GL_MAX_VIEWPORT_DIMS, max_viewport_size); + glamor_priv->max_fbo_size = MIN(glamor_priv->max_fbo_size, max_viewport_size[0]); + glamor_priv->max_fbo_size = MIN(glamor_priv->max_fbo_size, max_viewport_size[1]); #ifdef MAX_FBO_SIZE glamor_priv->max_fbo_size = MAX_FBO_SIZE; #endif |