Merge branch 'bugfix/KASM-4151-cherry-pick-fixes' into 'master'

KASM-4151 copying over fixes from gnome_blank branch

See merge request kasm-technologies/internal/KasmVNC!97
This commit is contained in:
Matthew McClaskey 2023-03-22 15:47:39 +00:00
commit 037eae7f44

View File

@ -219,9 +219,14 @@ void xvnc_sync_dri3_pixmap(PixmapPtr pixmap)
void *ptr; void *ptr;
uint32_t stride, w, h; uint32_t stride, w, h;
void *opaque = NULL; void *opaque = NULL;
// We may not be running on hw if there's a compositor using PRESENT on llvmpipe
if (!driNode)
return;
gbm_pixmap *gp = gbm_pixmap_get(pixmap); gbm_pixmap *gp = gbm_pixmap_get(pixmap);
if (!gp) { if (!gp) {
ErrorF("Present tried to copy from a non-dri3 pixmap\n"); //ErrorF("Present tried to copy from a non-dri3 pixmap\n");
return; return;
} }