Direct Composition + ADPF + hardware fence sync + event-driven render loop

app/src/main/cpp/CMakeLists.txt

@@ -138,6 +138,7 @@ add_library(winlator SHARED
         winlator/drawable.c
         winlator/native_content_io.cpp
         winlator/gpu_image.c
+        winlator/surface_compositor.c
         winlator/sync_fence.c
         winlator/sysvshared_memory.c
         winlator/xconnector_epoll.c

app/src/main/feature/library/GameSettings.kt

@@ -513,6 +513,9 @@ class GameSettingsStateHolder {
     val selectedStartupSelection = mutableIntStateOf(0)
     val execArgs = mutableStateOf("")
     val fullscreenStretched = mutableStateOf(false)
+    // Direct Composition (zero-copy AHB → SurfaceControl + HWC overlay).
+    // Per-container toggle; read once at activity startup. See Container.EXTRA_DIRECT_COMPOSITION.
+    val directComposition = mutableStateOf(false)
 
     // Advanced - CPU
     val cpuCount = mutableIntStateOf(Runtime.getRuntime().availableProcessors())
@@ -3661,6 +3664,14 @@ private fun AdvancedSection(
             checked = state.fullscreenStretched.value,
             onCheckedChange = { state.fullscreenStretched.value = it }
         )
+
+        Spacer(Modifier.height(SettingItemGap))
+
+        SettingCheckbox(
+            label = stringResource(R.string.session_display_direct_composition),
+            checked = state.directComposition.value,
+            onCheckedChange = { state.directComposition.value = it }
+        )
     }
 
     Spacer(Modifier.height(SettingSectionGap))

app/src/main/feature/settings/containers/ContainerSettingsComposeDialog.kt

@@ -422,6 +422,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
         }
 
         state.fullscreenStretched.value = c?.isFullscreenStretched() ?: false
+        state.directComposition.value = c?.isDirectCompositionEnabled() ?: false
 
         // Steam fields are shortcut-only in the UI; leave any existing steam
         // state on the container untouched — saveSettings() skips them.
@@ -799,6 +800,7 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
             c.setWinComponents(wincomponents)
             c.setDrives(drivesString)
             c.setFullscreenStretched(state.fullscreenStretched.value)
+            c.setDirectCompositionEnabled(state.directComposition.value)
             c.setInputType(finalInputType)
             c.setExclusiveXInput(state.containerExclusiveInput.value)
             c.setStartupSelection(startupSelection)
@@ -839,6 +841,10 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
                 data.put("wincomponents", wincomponents)
                 data.put("drives", drivesString)
                 data.put("fullscreenStretched", state.fullscreenStretched.value)
+                val extraDataObj = data.optJSONObject("extraData") ?: org.json.JSONObject()
+                extraDataObj.put(Container.EXTRA_DIRECT_COMPOSITION, if (state.directComposition.value) "1" else "0")
+                extraDataObj.put("swapRB", if (state.selectedSurfaceEffect.intValue == 1) "1" else "0")
+                data.put("extraData", extraDataObj)
                 data.put("inputType", finalInputType)
                 data.put("exclusiveXInput", state.containerExclusiveInput.value)
                 data.put("startupSelection", startupSelection.toInt())
@@ -847,7 +853,6 @@ class ContainerSettingsComposeDialog @JvmOverloads constructor(
                 data.put("fexcoreVersion", fexcoreVersion)
                 data.put("fexcorePreset", fexcorePreset)
                 data.put("desktopTheme", desktopTheme)
-                data.put("swapRB", if (state.selectedSurfaceEffect.intValue == 1) "1" else "0")
                 data.put("wineVersion", selectedWineStr)
                 data.put("midiSoundFont", midiSoundFont)
                 data.put("lc_all", state.lcAll.value)

app/src/main/feature/shortcuts/ShortcutSettingsComposeDialog.kt

@@ -415,6 +415,14 @@ class ShortcutSettingsComposeDialog private constructor(
         )
         state.fullscreenStretched.value = fullscreenStretched == "1"
 
+        // Direct Composition (per-shortcut override of the container setting).
+        // Falls back to the container's value when the shortcut doesn't override.
+        val directComposition = getShortcutSetting(
+            Container.EXTRA_DIRECT_COMPOSITION,
+            if (container.isDirectCompositionEnabled()) "1" else "0"
+        )
+        state.directComposition.value = directComposition == "1"
+
         // LC_ALL
         state.lcAll.value = getShortcutSetting("lc_all", container.getLC_ALL())
 
@@ -1071,6 +1079,13 @@ class ShortcutSettingsComposeDialog private constructor(
                 if (container.isFullscreenStretched) "1" else "0"
             )
 
+            // Direct Composition (per-shortcut override)
+            hasContainerOverride = hasContainerOverride or saveOverride(
+                Container.EXTRA_DIRECT_COMPOSITION,
+                if (state.directComposition.value) "1" else "0",
+                if (container.isDirectCompositionEnabled()) "1" else "0"
+            )
+
             // Win components
             val wincomponents = buildWinComponentsString()
             hasContainerOverride =
@@ -2160,6 +2175,7 @@ class ShortcutSettingsComposeDialog private constructor(
 
         state.lcAll.value = container.getLC_ALL()
         state.fullscreenStretched.value = container.isFullscreenStretched
+        state.directComposition.value = container.isDirectCompositionEnabled()
 
         val startupEntries = state.startupSelectionEntries.value
         state.selectedStartupSelection.intValue = container.getStartupSelection().toInt()

app/src/main/res/values-da/strings.xml

@@ -618,6 +618,7 @@ F.eks. <b>META</b> for <i>META-tast</i>, \n
     <string name="session_display_frame_rate">Billedhastighed</string>
     <string name="session_display_title">Skærm</string>
     <string name="session_display_fullscreen_stretched">Aktiver fuldskærm (strakt)</string>
+    <string name="session_display_direct_composition">Direkte komposition (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-de/strings.xml

@@ -618,6 +618,7 @@ Z. B. <b>META</b> für <i>Meta-Taste</i>, \n
     <string name="session_display_frame_rate">Bildrate</string>
     <string name="session_display_title">Anzeige</string>
     <string name="session_display_fullscreen_stretched">Vollbild aktivieren (Gestreckt)</string>
+    <string name="session_display_direct_composition">Direkte Komposition (Zero-Copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-es/strings.xml

@@ -618,6 +618,7 @@ Ej. <b>META</b> para la <i>tecla META</i>, \n
     <string name="session_display_frame_rate">Tasa de fotogramas</string>
     <string name="session_display_title">Pantalla</string>
     <string name="session_display_fullscreen_stretched">Activar pantalla completa (estirada)</string>
+    <string name="session_display_direct_composition">Composición directa (sin copia)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderizador:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-fr/strings.xml

@@ -618,6 +618,7 @@ Par ex. <b>META</b> pour la <i>touche META</i>, \n
     <string name="session_display_frame_rate">Fréquence d\'images</string>
     <string name="session_display_title">Affichage</string>
     <string name="session_display_fullscreen_stretched">Activer le plein écran (étiré)</string>
+    <string name="session_display_direct_composition">Composition directe (zéro copie)</string>
     <string name="session_display_fps_label">FPS :</string>
     <string name="session_display_renderer_label">Moteur de rendu :</string>
     <string name="session_display_gpu_label">GPU :</string>

app/src/main/res/values-hi/strings.xml

@@ -730,6 +730,7 @@
     <string name="session_display_frame_rate">फ़्रेम दर</string>
     <string name="session_display_title">डिस्प्ले</string>
     <string name="session_display_fullscreen_stretched">फ़ुलस्क्रीन सक्षम करें (खींचा हुआ)</string>
+    <string name="session_display_direct_composition">डायरेक्ट कंपोज़िशन (ज़ीरो-कॉपी)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-it/strings.xml

@@ -618,6 +618,7 @@ Ad es. <b>META</b> per il <i>tasto META</i>, \n
     <string name="session_display_frame_rate">Frequenza fotogrammi</string>
     <string name="session_display_title">Display</string>
     <string name="session_display_fullscreen_stretched">Abilita schermo intero (allungato)</string>
+    <string name="session_display_direct_composition">Composizione diretta (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-ko/strings.xml

@@ -618,6 +618,7 @@
     <string name="session_display_frame_rate">프레임 레이트</string>
     <string name="session_display_title">디스플레이</string>
     <string name="session_display_fullscreen_stretched">전체 화면 활성화 (늘림)</string>
+    <string name="session_display_direct_composition">다이렉트 컴포지션(제로 카피)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">렌더러:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-pl/strings.xml

@@ -624,6 +624,7 @@ Np. <b>META</b> dla <i>klawisza META</i>, \n
     <string name="session_display_frame_rate">Częstotliwość klatek</string>
     <string name="session_display_title">Wyświetlacz</string>
     <string name="session_display_fullscreen_stretched">Włącz pełny ekran (rozciągnięty)</string>
+    <string name="session_display_direct_composition">Kompozycja bezpośrednia (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -618,6 +618,7 @@ Ex. <b>META</b> para <i>tecla META</i>, \n
     <string name="session_display_frame_rate">Taxa de Quadros</string>
     <string name="session_display_title">Tela</string>
     <string name="session_display_fullscreen_stretched">Ativar Tela Cheia (Esticada)</string>
+    <string name="session_display_direct_composition">Composição direta (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderizador:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-ro/strings.xml

@@ -618,6 +618,7 @@ De ex. <b>META</b> pentru <i>tasta META</i>, \n
     <string name="session_display_frame_rate">Rata cadrelor</string>
     <string name="session_display_title">Afisaj</string>
     <string name="session_display_fullscreen_stretched">Activeaza ecran complet (intins)</string>
+    <string name="session_display_direct_composition">Compoziție directă (zero-copy)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-ru/strings.xml

@@ -686,6 +686,7 @@
     <string name="session_display_frame_rate">Частота кадров</string>
     <string name="session_display_title">Экран</string>
     <string name="session_display_fullscreen_stretched">Включить полноэкранный режим (растянутый)</string>
+    <string name="session_display_direct_composition">Прямая композиция (без копирования)</string>
     <string name="session_display_fps_label">ФПС:</string>
     <string name="session_display_renderer_label">Рендерер:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-uk/strings.xml

@@ -624,6 +624,7 @@
     <string name="session_display_frame_rate">Частота кадрів</string>
     <string name="session_display_title">Дисплей</string>
     <string name="session_display_fullscreen_stretched">Увімкнути повноекранний режим (розтягнутий)</string>
+    <string name="session_display_direct_composition">Пряма композиція (без копіювання)</string>
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Рендерер:</string>
     <string name="session_display_gpu_label">GPU:</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -618,6 +618,7 @@
     <string name="session_display_frame_rate">帧率</string>
     <string name="session_display_title">显示</string>
     <string name="session_display_fullscreen_stretched">启用全屏（拉伸）</string>
+    <string name="session_display_direct_composition">直接合成（零拷贝）</string>
     <string name="session_display_fps_label">FPS：</string>
     <string name="session_display_renderer_label">渲染器：</string>
     <string name="session_display_gpu_label">GPU：</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -618,6 +618,7 @@
     <string name="session_display_frame_rate">幀率</string>
     <string name="session_display_title">顯示</string>
     <string name="session_display_fullscreen_stretched">啟用全螢幕（拉伸）</string>
+    <string name="session_display_direct_composition">直接合成（零複製）</string>
     <string name="session_display_fps_label">FPS：</string>
     <string name="session_display_renderer_label">渲染器：</string>
     <string name="session_display_gpu_label">GPU：</string>

app/src/main/res/values/strings.xml

@@ -898,6 +898,7 @@ E.g. <b>META</b> for <i>META key</i>, \n
     <string name="session_display_fps_label">FPS:</string>
     <string name="session_display_renderer_label">Renderer:</string>
     <string name="session_display_gpu_label">GPU:</string>
+    <string name="session_display_direct_composition">Direct Composition (zero-copy)</string>
     <string name="session_display_ram_label">RAM:</string>
     <string name="session_display_ram_usage_format">%1$s GB Used / %2$s Total</string>
 

app/src/main/runtime/container/Container.java

@@ -31,6 +31,27 @@ public class Container {
     public static final String DEFAULT_GRAPHICSDRIVERCONFIG =
             "vulkanVersion=1.3" + ";version=" + ";blacklistedExtensions=" + ";maxDeviceMemory=0" + ";presentMode=mailbox" + ";syncFrame=0" + ";disablePresentWait=1" + ";resourceType=auto" + ";bcnEmulation=auto" + ";bcnEmulationType=compute" + ";bcnEmulationCache=0" + ";gpuName=Device";
     public static final String DEFAULT_DDRAWRAPPER = "none";
+
+    /**
+     * extraData JSON key for the per-container "Direct Composition" toggle.
+     * Stored as a string ("1"/"0") for symmetry with the rest of extraData.
+     * The setting is read at activity startup and applies for the whole
+     * session — it controls whether fullscreen drawables are pushed to a
+     * sibling Android SurfaceControl layer (zero-copy DPU scanout) instead of
+     * being composited by the VulkanRenderer. Changing it mid-game is not
+     * supported.
+     *
+     * <p>When enabled AND the device supports ASurfaceControl (API 29+) AND
+     * the device is not on the soft-boot blocklist (see SurfaceCompositor),
+     * the VulkanRenderer's per-frame hook extracts the AHardwareBuffer from
+     * the fullscreen direct-scanout candidate and hands it directly to
+     * SurfaceFlinger via ASurfaceTransaction_setBuffer. HWC promotes the
+     * layer to a DPU overlay plane — zero GPU compositing cost, zero buffer
+     * copy. This is the true zero-copy path.
+     *
+     * <p>When disabled (default), zero behavior change vs. pre-DC.
+     */
+    public static final String EXTRA_DIRECT_COMPOSITION = "directComposition";
     public static final String DEFAULT_WINCOMPONENTS = "direct3d=1,directsound=0,directmusic=0,directshow=0,directplay=0,xaudio=0,vcrun2010=1";
     public static final String FALLBACK_WINCOMPONENTS = "direct3d=1,directsound=1,directmusic=1,directshow=1,directplay=1,xaudio=1,vcrun2010=1";
     public static final String DEFAULT_DRIVES = "D:" + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + "F:" + Environment.getExternalStorageDirectory().getAbsolutePath();
@@ -299,6 +320,22 @@ public String getLanguage() {
         return getExtra("containerLanguage", "english");
     }
 
+    /**
+     * Whether this container should route fullscreen direct-scanout drawables
+     * to a sibling Android SurfaceControl layer (HWC overlay plane / DPU
+     * scanout) instead of having VulkanRenderer composite them. Default off.
+     *
+     * <p>Sampled once at activity startup and held for the session. Toggling
+     * has no effect on a running game; the user must relaunch the container.
+     */
+    public boolean isDirectCompositionEnabled() {
+        return "1".equals(getExtra(EXTRA_DIRECT_COMPOSITION, "0"));
+    }
+
+    public void setDirectCompositionEnabled(boolean enabled) {
+        putExtra(EXTRA_DIRECT_COMPOSITION, enabled ? "1" : "0");
+    }
+
     public String getExtra(String key) {
         return getExtra(key, "");
     }