From b98124467244f3f521bccc454e8f56eee0c91c84 Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Tue, 6 Oct 2026 03:16:21 -0400 Subject: [PATCH] [Refactor] (P13 W3b): strip the push/legacy-memo guards from MG_Impl, MG_Pipe and MG_Remote --- MobileGL/MG_Impl/GLImpl/Buffer/GL_Buffer.cpp | 4 --- .../GLImpl/Framebuffer/GL_Framebuffer.cpp | 36 ------------------- .../MG_Impl/GLImpl/Texture/GL_Texture.cpp | 8 ----- MobileGL/MG_Impl/Pipe/CompositeResolver.h | 2 -- MobileGL/MG_Impl/Pipe/CsoCache.h | 2 -- MobileGL/MG_Impl/Pipe/FramebufferEmit.h | 2 -- MobileGL/MG_Impl/Pipe/ImageEmit.h | 2 -- MobileGL/MG_Impl/Pipe/OwnedDrawInputs.h | 2 +- MobileGL/MG_Impl/Pipe/PipeFill.h | 5 --- MobileGL/MG_Impl/Pipe/ProgramEmit.h | 2 -- MobileGL/MG_Impl/Pipe/ResourceTracker.h | 2 -- MobileGL/MG_Impl/Pipe/SamplerEmit.h | 2 -- MobileGL/MG_Impl/Pipe/SetHashSuppressor.h | 2 -- MobileGL/MG_Impl/Pipe/ShaderBufferEmit.h | 2 -- MobileGL/MG_Impl/Pipe/TextureEmit.h | 2 -- MobileGL/MG_Impl/Pipe/Tracker.h | 2 -- MobileGL/MG_Impl/Pipe/VertexInputEmit.h | 2 -- MobileGL/MG_Pipe/PipeInputsSwitch.h | 7 ---- MobileGL/MG_Pipe/PipeMutation.h | 5 --- MobileGL/MG_Pipe/PipeRoute.cpp | 2 -- MobileGL/MG_Pipe/PipeRoute.h | 2 -- MobileGL/MG_Remote/Client/GpuWritePending.cpp | 4 --- 22 files changed, 1 insertion(+), 98 deletions(-) diff --git a/MobileGL/MG_Impl/GLImpl/Buffer/GL_Buffer.cpp b/MobileGL/MG_Impl/GLImpl/Buffer/GL_Buffer.cpp index 9608a9dc..4da81c87 100644 --- a/MobileGL/MG_Impl/GLImpl/Buffer/GL_Buffer.cpp +++ b/MobileGL/MG_Impl/GLImpl/Buffer/GL_Buffer.cpp @@ -1497,7 +1497,6 @@ namespace MobileGL::MG_Impl::GLImpl { return; } MG_State::pGLContext->TouchBufferBindingPoint(bufferTarget, pointIndex); -#if MOBILEGL_PIPE_PUSH // P5e (sb, CONTRACT-P5E.md ยง5.6). THE BIND-POINT GENERATION, and it is bumped HERE - // before the writes below and after every refusal above - rather than inside // BindingSlotRange1D, for two reasons. The slot has no back-pointer to the state @@ -1510,7 +1509,6 @@ namespace MobileGL::MG_Impl::GLImpl { // The dirty bits this feeds are 15/16/17 (Tracker.h); before P5e they shuttered on the // buffer CONTENT aggregate, which no bind has ever moved. MG_State::pGLContext->NoteBufferBindPointChanged(bufferTarget); -#endif auto& point = MG_State::pGLContext->GetBufferBindingPoint(bufferTarget, pointIndex); SharedPtr bufferObject; @@ -1634,13 +1632,11 @@ namespace MobileGL::MG_Impl::GLImpl { return; } MG_State::pGLContext->TouchBufferBindingPoint(bufferTarget, index); -#if MOBILEGL_PIPE_PUSH // P5e (sb): the other half of BindBufferBase_State's bump - same generation, same // placement, same reason. A glBindBufferRange moves the point's EXTENT as well as what // is bound to it, and the record carries the resolved Offset/Size, so a range change // with no object change still has to reach the emitter. MG_State::pGLContext->NoteBufferBindPointChanged(bufferTarget); -#endif auto& point = MG_State::pGLContext->GetBufferBindingPoint(bufferTarget, index); SharedPtr bufferObject; diff --git a/MobileGL/MG_Impl/GLImpl/Framebuffer/GL_Framebuffer.cpp b/MobileGL/MG_Impl/GLImpl/Framebuffer/GL_Framebuffer.cpp index 4d344c32..4510ccab 100644 --- a/MobileGL/MG_Impl/GLImpl/Framebuffer/GL_Framebuffer.cpp +++ b/MobileGL/MG_Impl/GLImpl/Framebuffer/GL_Framebuffer.cpp @@ -19,14 +19,12 @@ #if MOBILEGL_BUILD_DISAGGREGATED #include #endif -#if MOBILEGL_PIPE_PUSH // P4a, ID-19(c). This file is the ONLY place every DSA framebuffer entry point lives, and the // emitter it reaches is this package's own header rather than a declaration in one of the // contract's: MG_Pipe/PipeMutation.h is the door MG_State has into the client and carries no // framebuffer row, and MG_Impl/GLImpl and MG_Impl/Pipe are the same layer (this file already // includes MG_Impl/Pipe/PipeFill.h for MGP_FILL). #include -#endif #include #include #include @@ -624,7 +622,6 @@ namespace MobileGL::MG_Impl::GLImpl { framebufferObject->AttachTexture(attachmentType, textureObject, textureUploadTarget, level, 0, layered); } -#if MOBILEGL_PIPE_PUSH // P4a, ID-19(c): ANY FRAMEBUFFER THE SERVER IS ABOUT TO RECEIVE BY NAME HAS A RECORD. // // The applier keeps framebuffer records PER OBJECT, keyed by the handle - but before @@ -652,7 +649,6 @@ namespace MobileGL::MG_Impl::GLImpl { if (!fbo) return; MG_Pipe::MGPipeFramebufferEmitterInstance().EmitFramebufferByName(*fbo); } -#endif } // namespace void BlitFramebuffer_Backend(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, @@ -671,10 +667,8 @@ namespace MobileGL::MG_Impl::GLImpl { MGLOG_E_ONCE("glBlitNamedFramebuffer skipped: backend does not implement explicit framebuffer blit."); return; } -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(readFramebuffer); PipePublishFramebufferByName(drawFramebuffer); -#endif MGP_FILL(BlitNamedFramebuffer); blitNamedFramebuffer(readFramebuffer, drawFramebuffer, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); @@ -687,9 +681,7 @@ namespace MobileGL::MG_Impl::GLImpl { MGLOG_E_ONCE("glClearNamedFramebufferfv skipped: backend does not implement explicit framebuffer clear."); return; } -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebuffer); -#endif MGP_FILL(ClearNamedFramebufferfv); clearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value); } @@ -701,9 +693,7 @@ namespace MobileGL::MG_Impl::GLImpl { MGLOG_E_ONCE("glClearNamedFramebufferfi skipped: backend does not implement explicit framebuffer clear."); return; } -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebuffer); -#endif MGP_FILL(ClearNamedFramebufferfi); clearNamedFramebufferfi(framebuffer, buffer, drawbuffer, depth, stencil); } @@ -715,9 +705,7 @@ namespace MobileGL::MG_Impl::GLImpl { MGLOG_E_ONCE("glClearNamedFramebufferiv skipped: backend does not implement explicit framebuffer clear."); return; } -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebuffer); -#endif MGP_FILL(ClearNamedFramebufferiv); clearNamedFramebufferiv(framebuffer, buffer, drawbuffer, value); } @@ -729,9 +717,7 @@ namespace MobileGL::MG_Impl::GLImpl { MGLOG_E_ONCE("glClearNamedFramebufferuiv skipped: backend does not implement explicit framebuffer clear."); return; } -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebuffer); -#endif MGP_FILL(ClearNamedFramebufferuiv); clearNamedFramebufferuiv(framebuffer, buffer, drawbuffer, value); } @@ -1460,9 +1446,7 @@ namespace MobileGL::MG_Impl::GLImpl { if (texture == 0) { framebufferObject->Detach(attachmentType); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif return; } @@ -1489,9 +1473,7 @@ namespace MobileGL::MG_Impl::GLImpl { } framebufferObject->AttachTexture(attachmentType, textureObject, textureUploadTarget, level, 0, layered); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif } void NamedFramebufferTextureWithUploadTarget_State(const char* functionName, GLuint framebuffer, GLenum attachment, @@ -1515,9 +1497,7 @@ namespace MobileGL::MG_Impl::GLImpl { if (texture == 0) { framebufferObject->Detach(attachmentType); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif return; } @@ -1545,9 +1525,7 @@ namespace MobileGL::MG_Impl::GLImpl { } framebufferObject->AttachTexture(attachmentType, textureObject, textureUploadTarget, level); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif } void NamedFramebufferTexture1D_State(GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, @@ -1602,9 +1580,7 @@ namespace MobileGL::MG_Impl::GLImpl { if (texture == 0) { framebufferObject->Detach(attachmentType); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif return; } @@ -1707,9 +1683,7 @@ namespace MobileGL::MG_Impl::GLImpl { framebufferObject->AttachTexture(attachmentType, textureObject, textureUploadTarget, level, layer, /*layered=*/false); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif } void FramebufferRenderbuffer_State(GLenum target, GLenum attachment, GLenum renderbuffertarget, @@ -1779,9 +1753,7 @@ namespace MobileGL::MG_Impl::GLImpl { if (renderbuffer == 0) { framebufferObject->Detach(attachmentType); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif return; } @@ -1791,9 +1763,7 @@ namespace MobileGL::MG_Impl::GLImpl { if (!renderbufferObject) return; framebufferObject->AttachRenderbuffer(attachmentType, renderbufferObject); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif } void DrawBuffersForFramebuffer_State(const SharedPtr& fbo, Bool isDefaultFBO, @@ -1993,9 +1963,7 @@ namespace MobileGL::MG_Impl::GLImpl { : GetNamedFramebufferObject_State(framebuffer, "NamedFramebufferDrawBuffers_State"); if (!framebufferObject) return; DrawBuffersForFramebuffer_State(framebufferObject, framebuffer == 0, n, bufs, false); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif } void NamedFramebufferDrawBuffer_State(GLuint framebuffer, GLenum buf) { @@ -2010,9 +1978,7 @@ namespace MobileGL::MG_Impl::GLImpl { const GLenum bufs[] = {buf}; DrawBuffersForFramebuffer_State(framebufferObject, framebuffer == 0, 1, bufs, true); } -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif } void NamedFramebufferReadBuffer_State(GLuint framebuffer, GLenum src) { @@ -2022,9 +1988,7 @@ namespace MobileGL::MG_Impl::GLImpl { if (!framebufferObject) return; ReadBufferForFramebuffer_State(framebufferObject, framebuffer == 0, src, "NamedFramebufferReadBuffer_State"); -#if MOBILEGL_PIPE_PUSH PipePublishFramebufferByName(framebufferObject); -#endif } SharedPtr GetFramebufferObjectForNamedClear(GLuint framebuffer, diff --git a/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp b/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp index b5aea9ee..41411e60 100644 --- a/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp +++ b/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp @@ -1376,7 +1376,6 @@ namespace MobileGL::MG_Impl::GLImpl { std::format("pname {} is not a valid texture parameter.", MG_Util::ConvertGLEnumToString(pname)))); return; } -#if MOBILEGL_PIPE_PUSH // P4a, ID-18 M2 - THE THIRTEENTH MGP_NOTE_AGGREGATE(TextureParams) SITE, and the one // no publisher reached. Nine of the thirteen are TextureObject.cpp's own mutators and // publish through TextureObjectBase::PipePublishParams; the tenth is @@ -1399,7 +1398,6 @@ namespace MobileGL::MG_Impl::GLImpl { // free: the emitter's version-first skip reads GetTextureParamsVersion() AND // SamplerObject::GetVersion() and returns without hashing anything when neither moved. MobileGL::MG_Pipe::MGPipeEmitTextureParams(*textureObject); -#endif } void TextureParameterObjectf_State(const SharedPtr& textureObject, GLenum pname, @@ -1478,7 +1476,6 @@ namespace MobileGL::MG_Impl::GLImpl { std::format("pname {} is not a valid texture parameter.", MG_Util::ConvertGLEnumToString(pname)))); return; } -#if MOBILEGL_PIPE_PUSH // P4a, ID-18 M2 - THE THIRTEENTH MGP_NOTE_AGGREGATE(TextureParams) SITE, and the one // no publisher reached. Nine of the thirteen are TextureObject.cpp's own mutators and // publish through TextureObjectBase::PipePublishParams; the tenth is @@ -1501,7 +1498,6 @@ namespace MobileGL::MG_Impl::GLImpl { // free: the emitter's version-first skip reads GetTextureParamsVersion() AND // SamplerObject::GetVersion() and returns without hashing anything when neither moved. MobileGL::MG_Pipe::MGPipeEmitTextureParams(*textureObject); -#endif } void GetTextureParameterObjectiv_State(const SharedPtr& textureObject, @@ -2197,7 +2193,6 @@ namespace MobileGL::MG_Impl::GLImpl { std::format("pname {} is not a valid texture parameter.", MG_Util::ConvertGLEnumToString(pname)))); return; } -#if MOBILEGL_PIPE_PUSH // P4a, ID-18 M2 - THE THIRTEENTH MGP_NOTE_AGGREGATE(TextureParams) SITE, and the one // no publisher reached. Nine of the thirteen are TextureObject.cpp's own mutators and // publish through TextureObjectBase::PipePublishParams; the tenth is @@ -2220,7 +2215,6 @@ namespace MobileGL::MG_Impl::GLImpl { // free: the emitter's version-first skip reads GetTextureParamsVersion() AND // SamplerObject::GetVersion() and returns without hashing anything when neither moved. MobileGL::MG_Pipe::MGPipeEmitTextureParams(*textureObject); -#endif } void TexParameteri_State(GLenum target, GLenum pname, GLint param) { @@ -6815,7 +6809,6 @@ namespace MobileGL::MG_Impl::GLImpl { MG_State::pGLContext->GetImageTextureBinding(static_cast(unit)) .Bind(textureObject, level, layered, layer, access, format); MG_State::pGLContext->NoteTextureUnitTouched(static_cast(unit)); -#if MOBILEGL_PIPE_PUSH // AND THE IMAGE-UNIT MARK BESIDE IT. The line above moves the TEXTURE-unit high-water // mark, which is a different array: a reader that needs "the highest image unit ever // bound" cannot take it from there without either over-walking (a texture bind at unit @@ -6824,7 +6817,6 @@ namespace MobileGL::MG_Impl::GLImpl { // (MG_Remote/Client/GpuWritePending.cpp). Push builds only, so the pull build's bytes do // not move (G1). MG_State::pGLContext->NoteImageUnitTouched(static_cast(unit)); -#endif MGP_FILL(BindImageTexture); bindImageTexture(unit, texture, level, layered, layer, access, format); } diff --git a/MobileGL/MG_Impl/Pipe/CompositeResolver.h b/MobileGL/MG_Impl/Pipe/CompositeResolver.h index ccaaf91d..b964c397 100644 --- a/MobileGL/MG_Impl/Pipe/CompositeResolver.h +++ b/MobileGL/MG_Impl/Pipe/CompositeResolver.h @@ -81,7 +81,6 @@ // one and this one depends on nothing of the family's. The reverse arrangement would make the // resolver reachable only from a translation unit that had already decided to use it, i.e. // dead in the build that matters and live only in the tests. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -267,4 +266,3 @@ namespace MobileGL::MG_Pipe { return *resolver; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/CsoCache.h b/MobileGL/MG_Impl/Pipe/CsoCache.h index fb159353..539a8960 100644 --- a/MobileGL/MG_Impl/Pipe/CsoCache.h +++ b/MobileGL/MG_Impl/Pipe/CsoCache.h @@ -38,7 +38,6 @@ // // Header-only for the same ownership reason as Tracker.h: the root CMakeLists.txt that // would name a new .cpp is package A's and is frozen behind the p2/contract tag. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -203,4 +202,3 @@ namespace MobileGL::MG_Pipe { return *cache; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/FramebufferEmit.h b/MobileGL/MG_Impl/Pipe/FramebufferEmit.h index ae757069..d4d264eb 100644 --- a/MobileGL/MG_Impl/Pipe/FramebufferEmit.h +++ b/MobileGL/MG_Impl/Pipe/FramebufferEmit.h @@ -25,7 +25,6 @@ // HEADER-ONLY, for the ownership reason Tracker.h and ResourceTracker.h both state: the root // CMakeLists.txt that would name a new .cpp is the contract package's and is frozen behind the // tag. MG_Impl/Pipe/PipeFill.cpp is the one translation unit that includes it in the library. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -663,4 +662,3 @@ namespace MobileGL::MG_Pipe { return *emitter; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/ImageEmit.h b/MobileGL/MG_Impl/Pipe/ImageEmit.h index 9b18ef53..55f53e63 100644 --- a/MobileGL/MG_Impl/Pipe/ImageEmit.h +++ b/MobileGL/MG_Impl/Pipe/ImageEmit.h @@ -32,7 +32,6 @@ // // THIS FILE IS CREATED BY THE CONTRACT COMMIT AND FILLED BY THE PACKAGE THAT OWNS IT - see // FramebufferEmit.h for why, in full. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -195,4 +194,3 @@ namespace MobileGL::MG_Pipe { return *emitter; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/OwnedDrawInputs.h b/MobileGL/MG_Impl/Pipe/OwnedDrawInputs.h index 97502699..ef076859 100644 --- a/MobileGL/MG_Impl/Pipe/OwnedDrawInputs.h +++ b/MobileGL/MG_Impl/Pipe/OwnedDrawInputs.h @@ -9,7 +9,7 @@ // Client memory becomes ordinary owned buffer resources before a draw. #pragma once -#if MOBILEGL_BUILD_DISAGGREGATED && MOBILEGL_PIPE_PUSH +#if MOBILEGL_BUILD_DISAGGREGATED #include #include #include diff --git a/MobileGL/MG_Impl/Pipe/PipeFill.h b/MobileGL/MG_Impl/Pipe/PipeFill.h index e4bf6bc1..71eaface 100644 --- a/MobileGL/MG_Impl/Pipe/PipeFill.h +++ b/MobileGL/MG_Impl/Pipe/PipeFill.h @@ -13,7 +13,6 @@ // frontend fills the PipeInputs block for exactly the verbs that reach a backend. In the // pull build the macro is ((void)0) and the pull build is byte-identical to a tree without // it. -#if MOBILEGL_PIPE_PUSH #include namespace MobileGL::MG_Pipe { struct PipeInputs; @@ -176,7 +175,3 @@ namespace MobileGL::MG_Pipe { // neither declared nor defined. #define MGP_SET_BASE_INSTANCE(BaseInstance) \ ::MobileGL::MG_Pipe::MGPipeSetPendingBaseInstance(static_cast<::MobileGL::Uint32>(BaseInstance)) -#else -#define MGP_FILL(Verb) ((void)0) -#define MGP_SET_BASE_INSTANCE(BaseInstance) ((void)0) -#endif diff --git a/MobileGL/MG_Impl/Pipe/ProgramEmit.h b/MobileGL/MG_Impl/Pipe/ProgramEmit.h index 02e98b55..3b668e7c 100644 --- a/MobileGL/MG_Impl/Pipe/ProgramEmit.h +++ b/MobileGL/MG_Impl/Pipe/ProgramEmit.h @@ -35,7 +35,6 @@ // // THIS FILE IS CREATED BY THE CONTRACT COMMIT AND FILLED BY THE PACKAGE THAT OWNS IT - see // FramebufferEmit.h for why, in full. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -726,4 +725,3 @@ namespace MobileGL::MG_Pipe { return *emitter; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/ResourceTracker.h b/MobileGL/MG_Impl/Pipe/ResourceTracker.h index 51792381..427204ae 100644 --- a/MobileGL/MG_Impl/Pipe/ResourceTracker.h +++ b/MobileGL/MG_Impl/Pipe/ResourceTracker.h @@ -38,7 +38,6 @@ // upload; resource_subdata, the hot one, is observed through the pure builders below // instead (MGPipeBuildSubDataRecord / MGPipeForEachSubDataRecordRange), which is also what // lets a test drive the splitter at both of its bounds without a 4 GiB buffer. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -732,4 +731,3 @@ namespace MobileGL::MG_Pipe { gMGPipeCallbacks.OnGpuWritten(res, 1, &whole); } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/SamplerEmit.h b/MobileGL/MG_Impl/Pipe/SamplerEmit.h index c54f9fe6..ea513672 100644 --- a/MobileGL/MG_Impl/Pipe/SamplerEmit.h +++ b/MobileGL/MG_Impl/Pipe/SamplerEmit.h @@ -37,7 +37,6 @@ // detection. Neither is reproduced here and neither may be. // // HEADER-ONLY, for the ownership reason Tracker.h and ResourceTracker.h both state. -#if MOBILEGL_PIPE_PUSH #if MOBILEGL_BUILD_DISAGGREGATED #include #endif @@ -1178,4 +1177,3 @@ namespace MobileGL::MG_Pipe { return *emitter; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/SetHashSuppressor.h b/MobileGL/MG_Impl/Pipe/SetHashSuppressor.h index 82659443..80232799 100644 --- a/MobileGL/MG_Impl/Pipe/SetHashSuppressor.h +++ b/MobileGL/MG_Impl/Pipe/SetHashSuppressor.h @@ -37,7 +37,6 @@ // Header-only for the same ownership reason as Tracker.h and CsoCache.h: the root // CMakeLists.txt that would name a new .cpp belongs to package A and is frozen behind the // p2/contract tag. -#if MOBILEGL_PIPE_PUSH #include namespace MobileGL::MG_Pipe { @@ -131,4 +130,3 @@ namespace MobileGL::MG_Pipe { return *suppressor; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/ShaderBufferEmit.h b/MobileGL/MG_Impl/Pipe/ShaderBufferEmit.h index 5344a367..915240c4 100644 --- a/MobileGL/MG_Impl/Pipe/ShaderBufferEmit.h +++ b/MobileGL/MG_Impl/Pipe/ShaderBufferEmit.h @@ -48,7 +48,6 @@ // HEADER-ONLY, and the wired constant below is what switches the family on, for the ownership // reason PipeFill.cpp states in full: that file belongs to the contract package for the whole // phase, so the bit that turns an emitter on is a constant in the emitter's OWN header. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -274,4 +273,3 @@ namespace MobileGL::MG_Pipe { return *emitter; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/TextureEmit.h b/MobileGL/MG_Impl/Pipe/TextureEmit.h index 5ec15bb5..b5c31ec7 100644 --- a/MobileGL/MG_Impl/Pipe/TextureEmit.h +++ b/MobileGL/MG_Impl/Pipe/TextureEmit.h @@ -52,7 +52,6 @@ // and the PUBLICATION LATCH is A's too: MGPipeNoteHandlePublished is called where a create // actually goes out and MGPipeHandleIsPublished is what the death helpers read, so this file // keeps no Published flag of its own. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -1743,4 +1742,3 @@ namespace MobileGL::MG_Pipe { // The self-healing create in EmitResourceRespecify stays this file's: c0b provides no such // path and it is what repairs a texture born while the subsystem bit was clear. } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/Tracker.h b/MobileGL/MG_Impl/Pipe/Tracker.h index b26b403b..ecdd206a 100644 --- a/MobileGL/MG_Impl/Pipe/Tracker.h +++ b/MobileGL/MG_Impl/Pipe/Tracker.h @@ -57,7 +57,6 @@ // belongs to package A and is frozen behind the p2/contract tag. Everything here is // included by exactly one translation unit in the library (MG_Impl/Pipe/PipeFill.cpp) plus // the unit tests, so inline costs nothing. Splitting it back out is one list(APPEND) line. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -972,4 +971,3 @@ namespace MobileGL::MG_Pipe { return *tracker; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Impl/Pipe/VertexInputEmit.h b/MobileGL/MG_Impl/Pipe/VertexInputEmit.h index dd07b633..daf6c8b3 100644 --- a/MobileGL/MG_Impl/Pipe/VertexInputEmit.h +++ b/MobileGL/MG_Impl/Pipe/VertexInputEmit.h @@ -36,7 +36,6 @@ // straight to the applier, so "what was emitted" costs no copy at all. // // HEADER-ONLY, for the ownership reason Tracker.h states in full. -#if MOBILEGL_PIPE_PUSH #include #include #include @@ -455,4 +454,3 @@ namespace MobileGL::MG_Pipe { return *emitter; } } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Pipe/PipeInputsSwitch.h b/MobileGL/MG_Pipe/PipeInputsSwitch.h index 317e9882..2abd0552 100644 --- a/MobileGL/MG_Pipe/PipeInputsSwitch.h +++ b/MobileGL/MG_Pipe/PipeInputsSwitch.h @@ -14,15 +14,8 @@ // token for token. Push arm: the PipeInputs block the frontend fills at every verb boundary. // The pull arm is the ONLY place under MobileGL/ outside MG_State and MG_Impl that may spell // pGLContext; purity gate C greps MG_Backend/ for that token. -#if MOBILEGL_PIPE_PUSH #include #define MGB_CTX (&::MobileGL::MG_Pipe::gPipeInputs) #define MGB_CTX_LIVE (::MobileGL::MG_Pipe::gPipeInputs.IsLive()) #define MGB_CTX_IDENTITY (::MobileGL::MG_Pipe::gPipeInputs.ContextIdentity()) -#else -#include -#define MGB_CTX (::MobileGL::MG_State::pGLContext) -#define MGB_CTX_LIVE (::MobileGL::MG_State::pGLContext != nullptr) -#define MGB_CTX_IDENTITY (static_cast(::MobileGL::MG_State::pGLContext.get())) -#endif #endif diff --git a/MobileGL/MG_Pipe/PipeMutation.h b/MobileGL/MG_Pipe/PipeMutation.h index 2e99bfac..e8e3c6fc 100644 --- a/MobileGL/MG_Pipe/PipeMutation.h +++ b/MobileGL/MG_Pipe/PipeMutation.h @@ -26,7 +26,6 @@ // // In the pull build the macro is ((void)0) and this header includes nothing, so the pull // build is byte-identical to a tree without it. -#if MOBILEGL_PIPE_PUSH #include namespace MobileGL::MG_Pipe { // MG_Impl/Pipe/PipeFill.cpp (the client side, the only place that may spell pGLContext). @@ -497,8 +496,4 @@ namespace MobileGL::MG_Pipe { ::MobileGL::MG_Pipe::MGPipeNoteFrontendMutation(::MobileGL::MG_Pipe::MGPipeInputField::Field) #define MGP_NOTE_AGGREGATE(Aggregate) \ ::MobileGL::MG_Pipe::MGPipeNoteAggregate(::MobileGL::MG_Pipe::MGPipeAggregate::Aggregate) -#else -#define MGP_NOTE_MUTATION(Field) ((void)0) -#define MGP_NOTE_AGGREGATE(Aggregate) ((void)0) -#endif #endif diff --git a/MobileGL/MG_Pipe/PipeRoute.cpp b/MobileGL/MG_Pipe/PipeRoute.cpp index 00ea26f4..c69d1248 100644 --- a/MobileGL/MG_Pipe/PipeRoute.cpp +++ b/MobileGL/MG_Pipe/PipeRoute.cpp @@ -30,7 +30,6 @@ #include "PipeRoute.h" -#if MOBILEGL_PIPE_PUSH #include @@ -401,4 +400,3 @@ namespace MobileGL::MG_Pipe { } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Pipe/PipeRoute.h b/MobileGL/MG_Pipe/PipeRoute.h index 76001e70..f766038b 100644 --- a/MobileGL/MG_Pipe/PipeRoute.h +++ b/MobileGL/MG_Pipe/PipeRoute.h @@ -84,7 +84,6 @@ #pragma once #include -#if MOBILEGL_PIPE_PUSH #include "MGPipe.h" #include "PipeApply.h" @@ -560,4 +559,3 @@ namespace MobileGL::MG_Pipe { } // namespace MobileGL::MG_Pipe -#endif // MOBILEGL_PIPE_PUSH diff --git a/MobileGL/MG_Remote/Client/GpuWritePending.cpp b/MobileGL/MG_Remote/Client/GpuWritePending.cpp index 7a417646..64ce3ae8 100644 --- a/MobileGL/MG_Remote/Client/GpuWritePending.cpp +++ b/MobileGL/MG_Remote/Client/GpuWritePending.cpp @@ -181,11 +181,7 @@ namespace MobileGL::MG_Remote::Client { Bool BufferWritebackIsReachable(const BufferObject& buffer) { if (buffer.GetSize() == 0) return false; -#if MOBILEGL_PIPE_PUSH return MG_Pipe::MGPipeResourceSubsystemEnabled(); -#else - return false; -#endif } SizeT BufferWritebackSliceBytes() {