2 files changed, 40 insertions, 19 deletions

diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c
index 74f2a0e08d..3f669bfc4d 100644
--- a/gdk/gdkvulkancontext.c
+++ b/gdk/gdkvulkancontext.c
@@ -474,24 +474,35 @@ gdk_vulkan_context_end_frame (GdkDrawContext *draw_context,
   GdkSurface *surface = gdk_draw_context_get_surface (draw_context);
   VkPresentRegionsKHR *regionsptr = VK_NULL_HANDLE;
   VkPresentRegionsKHR regions;
-  cairo_rectangle_int_t extents;
+  VkRectLayerKHR *rectangles;
+  int n_regions;
   int scale;
 
-  cairo_region_get_extents (painted, &extents);
   scale = gdk_surface_get_scale_factor (surface);
+  n_regions = cairo_region_num_rectangles (painted);
+  rectangles = g_alloca (sizeof (VkRectLayerKHR) * n_regions);
+
+  for (int i = 0; i < n_regions; i++)
+    {
+      cairo_rectangle_int_t r;
+
+      cairo_region_get_rectangle (painted, i, &r);
+
+      rectangles[i] = (VkRectLayerKHR) {
+          .layer = 0,
+          .offset.x = r.x * scale,
+          .offset.y = r.y * scale,
+          .extent.width = r.width * scale,
+          .extent.height = r.height * scale,
+      };
+    }
 
   regions = (VkPresentRegionsKHR) {
       .sType = VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR,
       .swapchainCount = 1,
       .pRegions = &(VkPresentRegionKHR) {
-          .rectangleCount = 1,
-          .pRectangles = &(VkRectLayerKHR) {
-              .layer = 0,
-              .offset.x = extents.x * scale,
-              .offset.y = extents.y * scale,
-              .extent.width = extents.width * scale,
-              .extent.height = extents.height * scale,
-          }
+        .rectangleCount = n_regions,
+        .pRectangles = rectangles,
       },
   };
 
@@ -1090,11 +1101,19 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
                                  VK_VERSION_MINOR (layers[i].specVersion),
                                  VK_VERSION_PATCH (layers[i].specVersion),
                                  layers[i].description);
-      if ((gdk_display_get_debug_flags (display) & GDK_DEBUG_VULKAN_VALIDATE) &&
-          g_str_equal (layers[i].layerName, "VK_LAYER_LUNARG_standard_validation"))
+      if (gdk_display_get_debug_flags (display) & GDK_DEBUG_VULKAN_VALIDATE)
         {
-          g_ptr_array_add (used_layers, (gpointer) "VK_LAYER_LUNARG_standard_validation");
-          validate = TRUE;
+          const char *validation_layer_names[] = {
+            "VK_LAYER_LUNARG_standard_validation",
+            "VK_LAYER_KHRONOS_validation",
+            NULL,
+          };
+
+          if (g_strv_contains (validation_layer_names, layers[i].layerName))
+            {
+              g_ptr_array_add (used_layers, layers[i].layerName);
+              validate = TRUE;
+            }
         }
     }
 
diff --git a/gsk/vulkan/gskvulkanglyphcache.c b/gsk/vulkan/gskvulkanglyphcache.c
index f1adefafca..15db38d9aa 100644
--- a/gsk/vulkan/gskvulkanglyphcache.c
+++ b/gsk/vulkan/gskvulkanglyphcache.c
@@ -270,11 +270,8 @@ render_glyph (Atlas          *atlas,
 
   gi.glyph = key->glyph;
   gi.geometry.width = value->draw_width * 1024;
-  if (key->glyph & PANGO_GLYPH_UNKNOWN_FLAG)
-    gi.geometry.x_offset = key->xshift * 256;
-  else
-    gi.geometry.x_offset = key->xshift * 256 - value->draw_x * 1024;
-  gi.geometry.y_offset = key->yshift * 256 - value->draw_y * 1024;
+  gi.geometry.x_offset = (0.25 * key->xshift - value->draw_x) * 1024;
+  gi.geometry.y_offset = (0.25 * key->yshift - value->draw_y) * 1024;
 
   glyphs.num_glyphs = 1;
   glyphs.glyphs = &gi;
@@ -381,6 +378,11 @@ gsk_vulkan_glyph_cache_lookup (GskVulkanGlyphCache *cache,
       pango_font_get_glyph_extents (font, glyph, &ink_rect, NULL);
       pango_extents_to_pixels (&ink_rect, NULL);
 
+      ink_rect.x -= 1;
+      ink_rect.y -= 1;
+      ink_rect.width += 2;
+      ink_rect.height += 2;
+
       value->draw_x = ink_rect.x;
       value->draw_y = ink_rect.y;
       value->draw_width = ink_rect.width;