xwayland: Use border width in xwl_glamor_gbm_create_pixmap_for_window
Otherwise the pixmap is too small for a window with non-0 border width.
Fixes: 9730fb64ea ("xwayland: Add create_pixmap_for_window() to GBM backend")
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1314>
			
			
This commit is contained in:
		
							parent
							
								
									53a0442b87
								
							
						
					
					
						commit
						913631071e
					
				| 
						 | 
					@ -396,11 +396,14 @@ xwl_glamor_gbm_create_pixmap(ScreenPtr screen,
 | 
				
			||||||
static PixmapPtr
 | 
					static PixmapPtr
 | 
				
			||||||
xwl_glamor_gbm_create_pixmap_for_window(struct xwl_window *xwl_window)
 | 
					xwl_glamor_gbm_create_pixmap_for_window(struct xwl_window *xwl_window)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    WindowPtr window = xwl_window->window;
 | 
				
			||||||
 | 
					    unsigned border_width = 2 * window->borderWidth;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return xwl_glamor_gbm_create_pixmap_internal(xwl_window->xwl_screen,
 | 
					    return xwl_glamor_gbm_create_pixmap_internal(xwl_window->xwl_screen,
 | 
				
			||||||
                                                 &xwl_window->window->drawable,
 | 
					                                                 &window->drawable,
 | 
				
			||||||
                                                 xwl_window->window->drawable.width,
 | 
					                                                 window->drawable.width + border_width,
 | 
				
			||||||
                                                 xwl_window->window->drawable.height,
 | 
					                                                 window->drawable.height + border_width,
 | 
				
			||||||
                                                 xwl_window->window->drawable.depth,
 | 
					                                                 window->drawable.depth,
 | 
				
			||||||
                                                 CREATE_PIXMAP_USAGE_BACKING_PIXMAP,
 | 
					                                                 CREATE_PIXMAP_USAGE_BACKING_PIXMAP,
 | 
				
			||||||
                                                 xwl_window->has_implicit_scanout_support);
 | 
					                                                 xwl_window->has_implicit_scanout_support);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue