From eb71b669b304e7618e6432304a5012e7dcae4ce2 Mon Sep 17 00:00:00 2001
From: Swung0x48 <swung0x4b@gmail.com>
Date: Sun, 4 Oct 2026 06:29:41 -0400
Subject: [PATCH] [Fix] (Build): make the pull and verify builds compile again

---
 MobileGL/MG_Backend/BackendObject.h                       | 2 +-
 .../MG_Backend/DirectVulkan/Renderer/VulkanRenderer.cpp   | 2 ++
 .../MG_Backend/DirectVulkan/Renderer/VulkanRenderer.h     | 8 ++++----
 MobileGL/MG_Impl/Pipe/PipeFill.cpp                        | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/MobileGL/MG_Backend/BackendObject.h b/MobileGL/MG_Backend/BackendObject.h
index a56a4f5a..aa542cc1 100644
--- a/MobileGL/MG_Backend/BackendObject.h
+++ b/MobileGL/MG_Backend/BackendObject.h
@@ -9,9 +9,9 @@
 #pragma once
 #include <Includes.h>
 #include "MG_State/GLState/TextureState/TextureEnum.h"
+#include <MG_Util/Damage/Damage.h>
 #if MOBILEGL_BUILD_DISAGGREGATED
 #include <MG_Pipe/MGPipeHandles.h>
-#include <MG_Util/Damage/Damage.h>
 #endif
 
 namespace MobileGL {
diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRenderer.cpp b/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRenderer.cpp
index 10174bce..a6d97bd3 100644
--- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRenderer.cpp
+++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRenderer.cpp
@@ -16040,6 +16040,7 @@ void main() {
             }
         }
 
+#if MOBILEGL_BUILD_DISAGGREGATED
         // YUV shared images (WireYuvImage.inc) are sampled through a VkSamplerYcbcrConversion, a
         // feature of its own; asked only where AHardwareBuffers are imported at all.
         m_samplerYcbcrConversion = false;
@@ -16056,6 +16057,7 @@ void main() {
                 m_samplerYcbcrConversion = true;
             }
         }
+#endif
 
         // VK_EXT_multi_draw: tier 1 of the multi-draw dispatch - one vkCmdDrawMulti(Indexed)EXT
         // for a whole glMultiDraw* batch (VkMultiDrawIndexedInfoEXT carries per-draw
diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRenderer.h b/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRenderer.h
index 80f48b94..9416fc1f 100644
--- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRenderer.h
+++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRenderer.h
@@ -146,6 +146,10 @@ namespace MobileGL::MG_Backend::DirectVulkan {
         // IBufferCopyCommandProvider: recording command buffer, outside any
         // render pass, for immediate staged buffer copies.
         VkCommandBuffer AcquireBufferCopyCommandBuffer() override;
+        // EGL_BUFFER_AGE_EXT of the active target's default framebuffer for the next frame: the age
+        // of the swapchain image acquired for it (SwapchainObject::BufferAgeOf). Asking makes the
+        // target keep its presented images' content from then on.
+        Int32 CurrentDrawBufferAge();
 #if MOBILEGL_BUILD_DISAGGREGATED
         VkBufferManager& GetWireBufferManager() { return m_bufferManager; }
         Bool FlushWirePendingCommandsForTextureUpdate() {
@@ -201,10 +205,6 @@ namespace MobileGL::MG_Backend::DirectVulkan {
         // submission's sync_file in `*fence` (-1: none, and the work is waited out here), and - for
         // a session that writes images - the boundary PublishSharedImageAccesses makes.
         Bool ExportNativeFence(int* fence);
-        // EGL_BUFFER_AGE_EXT of the active target's default framebuffer for the next frame: the age
-        // of the swapchain image acquired for it (SwapchainObject::BufferAgeOf). Asking makes the
-        // target keep its presented images' content from then on.
-        Int32 CurrentDrawBufferAge();
         // The reading side's per-use hook (WireSharedImage.inc): every shared-image texture the
         // wire draw or dispatch being set up samples (VkTextureManager::NoteSharedImageUse) is
         // acquired from the foreign family before it, when it moved or is not held.
diff --git a/MobileGL/MG_Impl/Pipe/PipeFill.cpp b/MobileGL/MG_Impl/Pipe/PipeFill.cpp
index bdd015c5..31b0c301 100644
--- a/MobileGL/MG_Impl/Pipe/PipeFill.cpp
+++ b/MobileGL/MG_Impl/Pipe/PipeFill.cpp
@@ -3988,6 +3988,7 @@ namespace MobileGL::MG_Pipe {
     }
 
     void MGPipeClientDrainTextureUploads() {
+#if MOBILEGL_BUILD_DISAGGREGATED
         if (MG_Config::Transport == MG_Config::TransportMode::Monolith) return;
         if (MG_Remote::Client::RunsAsTheServerRole()) return;
         auto* ctx = LiveContext();
@@ -3999,6 +4000,7 @@ namespace MobileGL::MG_Pipe {
             P4aFamilyDependenciesAreSet(kMGPipeSubsystemTextureResources, pushMask)) {
             (void)MGPipeTextureEmitterInstance().DrainTextureSubData(*ctx);
         }
+#endif
     }
 
 #if MOBILEGL_BUILD_DISAGGREGATED