mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-20 08:21:56 +09:00
[Fix] (Build): make the pull and verify builds compile again
This commit is contained in:
@@ -9,9 +9,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <Includes.h>
|
#include <Includes.h>
|
||||||
#include "MG_State/GLState/TextureState/TextureEnum.h"
|
#include "MG_State/GLState/TextureState/TextureEnum.h"
|
||||||
|
#include <MG_Util/Damage/Damage.h>
|
||||||
#if MOBILEGL_BUILD_DISAGGREGATED
|
#if MOBILEGL_BUILD_DISAGGREGATED
|
||||||
#include <MG_Pipe/MGPipeHandles.h>
|
#include <MG_Pipe/MGPipeHandles.h>
|
||||||
#include <MG_Util/Damage/Damage.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace MobileGL {
|
namespace MobileGL {
|
||||||
|
|||||||
@@ -16040,6 +16040,7 @@ void main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if MOBILEGL_BUILD_DISAGGREGATED
|
||||||
// YUV shared images (WireYuvImage.inc) are sampled through a VkSamplerYcbcrConversion, a
|
// YUV shared images (WireYuvImage.inc) are sampled through a VkSamplerYcbcrConversion, a
|
||||||
// feature of its own; asked only where AHardwareBuffers are imported at all.
|
// feature of its own; asked only where AHardwareBuffers are imported at all.
|
||||||
m_samplerYcbcrConversion = false;
|
m_samplerYcbcrConversion = false;
|
||||||
@@ -16056,6 +16057,7 @@ void main() {
|
|||||||
m_samplerYcbcrConversion = true;
|
m_samplerYcbcrConversion = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// VK_EXT_multi_draw: tier 1 of the multi-draw dispatch - one vkCmdDrawMulti(Indexed)EXT
|
// VK_EXT_multi_draw: tier 1 of the multi-draw dispatch - one vkCmdDrawMulti(Indexed)EXT
|
||||||
// for a whole glMultiDraw* batch (VkMultiDrawIndexedInfoEXT carries per-draw
|
// for a whole glMultiDraw* batch (VkMultiDrawIndexedInfoEXT carries per-draw
|
||||||
|
|||||||
@@ -146,6 +146,10 @@ namespace MobileGL::MG_Backend::DirectVulkan {
|
|||||||
// IBufferCopyCommandProvider: recording command buffer, outside any
|
// IBufferCopyCommandProvider: recording command buffer, outside any
|
||||||
// render pass, for immediate staged buffer copies.
|
// render pass, for immediate staged buffer copies.
|
||||||
VkCommandBuffer AcquireBufferCopyCommandBuffer() override;
|
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
|
#if MOBILEGL_BUILD_DISAGGREGATED
|
||||||
VkBufferManager& GetWireBufferManager() { return m_bufferManager; }
|
VkBufferManager& GetWireBufferManager() { return m_bufferManager; }
|
||||||
Bool FlushWirePendingCommandsForTextureUpdate() {
|
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
|
// 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.
|
// a session that writes images - the boundary PublishSharedImageAccesses makes.
|
||||||
Bool ExportNativeFence(int* fence);
|
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
|
// 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
|
// 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.
|
// acquired from the foreign family before it, when it moved or is not held.
|
||||||
|
|||||||
@@ -3988,6 +3988,7 @@ namespace MobileGL::MG_Pipe {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void MGPipeClientDrainTextureUploads() {
|
void MGPipeClientDrainTextureUploads() {
|
||||||
|
#if MOBILEGL_BUILD_DISAGGREGATED
|
||||||
if (MG_Config::Transport == MG_Config::TransportMode::Monolith) return;
|
if (MG_Config::Transport == MG_Config::TransportMode::Monolith) return;
|
||||||
if (MG_Remote::Client::RunsAsTheServerRole()) return;
|
if (MG_Remote::Client::RunsAsTheServerRole()) return;
|
||||||
auto* ctx = LiveContext();
|
auto* ctx = LiveContext();
|
||||||
@@ -3999,6 +4000,7 @@ namespace MobileGL::MG_Pipe {
|
|||||||
P4aFamilyDependenciesAreSet(kMGPipeSubsystemTextureResources, pushMask)) {
|
P4aFamilyDependenciesAreSet(kMGPipeSubsystemTextureResources, pushMask)) {
|
||||||
(void)MGPipeTextureEmitterInstance().DrainTextureSubData(*ctx);
|
(void)MGPipeTextureEmitterInstance().DrainTextureSubData(*ctx);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if MOBILEGL_BUILD_DISAGGREGATED
|
#if MOBILEGL_BUILD_DISAGGREGATED
|
||||||
|
|||||||
Reference in New Issue
Block a user