diff --git a/src/vulkan/wrapper/wrapper_device.c b/src/vulkan/wrapper/wrapper_device.c
index 2602532d383..9afa8fc7529 100644
--- a/src/vulkan/wrapper/wrapper_device.c
+++ b/src/vulkan/wrapper/wrapper_device.c
@@ -1230,6 +1230,12 @@ wrapper_emit_diag(struct wrapper_physical_device *pdev,
    D("engine: '%s' -> detected %s (app '%s')\n", eng, detected,
      pdev->instance->vk.app_info.app_name ? pdev->instance->vk.app_info.app_name : "");
    D("--- native capabilities (what THIS device actually has) ---\n");
+   D("  fillModeNonSolid           : native=%d advertised=%d\n",
+     pdev->base_supported_features.fillModeNonSolid,
+     pdev->vk.supported_features.fillModeNonSolid);
+   D("  shaderClipDistance        : native=%d advertised=%d\n",
+     pdev->base_supported_features.shaderClipDistance,
+     pdev->vk.supported_features.shaderClipDistance);
    D("  textureCompressionBC       : %d\n", pdev->base_supported_features.textureCompressionBC);
    D("  textureCompressionASTC_LDR : %d\n", pdev->base_supported_features.textureCompressionASTC_LDR);
    D("  robustBufferAccess2        : %d\n", pdev->base_supported_features.robustBufferAccess2);
diff --git a/src/vulkan/wrapper/wrapper_log.c b/src/vulkan/wrapper/wrapper_log.c
index a2af67a5a2f..154bc8f6cad 100644
--- a/src/vulkan/wrapper/wrapper_log.c
+++ b/src/vulkan/wrapper/wrapper_log.c
@@ -136,6 +136,13 @@ void write_to_logfile(const char *fmt, const char *level, ...)  {
 
 void init_wrapper_logging()
 {
+   /* Diagnostic package: keep the existing capability/format/copy probes on
+    * even when the launcher does not pass the guest diagnostic environment
+    * through to the native OpenGL/Zink driver process. */
+   setenv("WRAPPER_DIAG", "1", 1);
+   fprintf(stderr, "[WRAPPER_DIAG] isaac-wrapper-diagnostic-1 loaded; automatic capability/format/copy capture enabled\n");
+   fflush(stderr);
+
    char *wrapper_log_level_env = getenv("WRAPPER_LOG_LEVEL");
    parse_wrapper_debug_str(wrapper_log_level_env);