mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-20 16:31:57 +09:00
Merge branch 'p5f/fm' of /mnt/c/Users/geekerwan/AndroidStudioProjects/FoldCraftLauncher/.git/modules/MobileGL into codex/p5f-wave2
# Conflicts: # MobileGL/MG_Pipe/PipeApply.h # MobileGL/MG_Remote/Server/PipeApplier.cpp
This commit is contained in:
@@ -44,6 +44,8 @@
|
||||
// server-role-only fixture: there the direct call is the only reset that exists).
|
||||
#include <MG_Remote/Client/ClientSession.h>
|
||||
#include <MG_Remote/Server/ServerLoop.h>
|
||||
#include <MG_Remote/Server/ServerSession.h>
|
||||
#include <MG_Remote/CapsCodec.h>
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
@@ -1235,6 +1237,13 @@ namespace MobileGL::MG_Pipe {
|
||||
// site: ApplyUnitWindow validates and writes in one step, so the question has to be
|
||||
// asked in front of it.
|
||||
Bool NoP4aConsumer() {
|
||||
#if MOBILEGL_BUILD_DISAGGREGATED
|
||||
if (MG_Config::Transport != MG_Config::TransportMode::Monolith) {
|
||||
const auto* session = MG_Remote::Server::ServerSession::Active();
|
||||
if (session && session->CallMaskIsSet() && MG_Remote::MGCapsServerConsumes(
|
||||
session->CallMask(), kMGPipeSubsystemTextureResources)) return false;
|
||||
}
|
||||
#endif
|
||||
if (g_resourceOps != nullptr) return false;
|
||||
++g_applier.RefusedNoConsumer;
|
||||
return true;
|
||||
|
||||
@@ -851,6 +851,8 @@ namespace MobileGL::MG_Pipe {
|
||||
UnorderedMap<Uint64, MGPStreamOutputBegin> StreamOutputSpans;
|
||||
// generate_mipmap's texture (MGPMipPlan::Res).
|
||||
MGPipeHandle VerbMipRes = kMGPipeNullHandle;
|
||||
Uint16 VerbMipBaseLevel = 0;
|
||||
Uint16 VerbMipLevelCount = 0;
|
||||
// The current indirect draw's command buffer and (for the *Count forms) parameter
|
||||
// buffer (MGPDrawIndirect::Buffer / ParameterBuffer).
|
||||
MGPipeHandle VerbIndirectBuffer = kMGPipeNullHandle;
|
||||
@@ -875,6 +877,7 @@ namespace MobileGL::MG_Pipe {
|
||||
VerbCopyTexDst = kMGPipeNullHandle;
|
||||
VerbStorageBlockProgram = kMGPipeNullHandle;
|
||||
VerbMipRes = kMGPipeNullHandle;
|
||||
VerbMipBaseLevel = VerbMipLevelCount = 0;
|
||||
VerbIndirectBuffer = kMGPipeNullHandle;
|
||||
VerbIndirectParameterBuffer = kMGPipeNullHandle;
|
||||
VerbDispatchIndirectBuffer = kMGPipeNullHandle;
|
||||
|
||||
Reference in New Issue
Block a user