[MG_Pipe, MG_Remote, MG_Impl] (P7): the ID-49 neutral read_pixels pack has one spelling

- MG_Pipe/MGPipeTypes.h gains inline MGPipeNeutralReadPixelsPack() next to MGPPixelPackState, whose owner it is; the applier that installs the neutral state and the comparator whose oracle it is now call the same function
- MG_Remote/Server/PipeApplier.cpp read_pixels takes the constant from there instead of building it field by field
- MG_Impl/Pipe/PipeFill.cpp drops ServerReadPixelsNeutralPack, the re-typed second copy: a drift between two hand-typed spellings costs a FALSE DIVERGENCE on the server read, not a build break, which is the direction that fails quietly
- notes/p7/verify-split.md 2.2 says one spelling and why the old reasoning (do not reach into MG_Remote/Server from MG_Impl) did not survive the failure-direction argument
This commit is contained in:
2026-09-22 21:35:06 -04:00
parent f4b0662d7e
commit ca8cbe5c34
4 changed files with 40 additions and 22 deletions
+7 -14
View File
@@ -681,19 +681,12 @@ namespace MobileGL::MG_Pipe {
self.CurrentVerb() == MGPipeVerb::ReadPixels;
}
// PipeApplier.cpp's `neutralPack`, field for field. A second spelling of a constant is
// the price of not reaching into MG_Remote/Server from here; if the two ever part, the
// server-side read stops matching this and the lane goes red by name, which is the
// direction that fails loudly.
PixelStoreParameters ServerReadPixelsNeutralPack() {
PixelStoreParameters neutral{};
neutral.RowLength = 0;
neutral.SkipRows = 0;
neutral.SkipPixels = 0;
neutral.SkipImages = 0;
neutral.Alignment = 1;
return neutral;
}
// The constant itself is MG_Pipe's (MGPipeTypes.h's MGPipeNeutralReadPixelsPack), which is
// the same function MG_Remote/Server/PipeApplier.cpp's read_pixels installs. It used to be
// re-typed here, field for field, to avoid reaching into MG_Remote/Server from MG_Impl -
// but the owner of MGPPixelPackState is MG_Pipe, both sites already include it, and a
// drift between the two spellings would have cost a false divergence rather than a build
// break.
#endif // MOBILEGL_BUILD_DISAGGREGATED
#endif // MOBILEGL_PIPE_VERIFY
} // namespace
@@ -740,7 +733,7 @@ namespace MobileGL::MG_Pipe {
g_verify.InHook = true;
PipeInputs::VisitStorage(field, g_readScratch, g_readScratch, [](auto& live, auto&) {
if constexpr (std::is_same_v<std::remove_reference_t<decltype(live)>, PixelStoreParameters[2]>) {
live[0] = ServerReadPixelsNeutralPack();
live[0] = MGPipeNeutralReadPixelsPack().Pack;
}
return true;
});
+25
View File
@@ -1139,6 +1139,31 @@ namespace MobileGL::MG_Pipe {
static_assert(sizeof(MGPPixelPackState) == 28,
"MGPPixelPackState changed size; update the wire format and this assertion");
// ID-49's NEUTRAL PACK, in one place. The server's read_pixels reads the backend with this
// state and scatters the tight reply through the application's own pack on the client side
// (MG_Remote/Server/PipeApplier.cpp), so the pack state never shapes the wire answer.
//
// ONE SPELLING, because there are two readers of the same constant and they are in different
// libraries: the applier that installs it, and (in a verify build) the compare-at-read hook in
// MG_Impl/Pipe/PipeFill.cpp, whose oracle for the pack half inside that window IS this value.
// Two hand-typed copies would drift silently in the ONE direction that matters - the hook
// would stop recognising the window and start reporting a divergence that is not one - so
// MG_Pipe, which owns MGPPixelPackState, owns the constant as well.
//
// Value-initialised and then the five fields the applier sets: RowLength / SkipRows /
// SkipPixels / SkipImages are already 0 by PixelStoreParameters' own defaults and are spelled
// out anyway, because "neutral" is a statement about every member rather than about the ones
// whose default happens to be right.
inline MGPPixelPackState MGPipeNeutralReadPixelsPack() {
MGPPixelPackState neutral{};
neutral.Pack.RowLength = 0;
neutral.Pack.SkipRows = 0;
neutral.Pack.SkipPixels = 0;
neutral.Pack.SkipImages = 0;
neutral.Pack.Alignment = 1;
return neutral;
}
// Also a shader-variant input: both backends bake these into the synthesized
// pass-through control stage.
struct MGPPatchState {
+4 -6
View File
@@ -452,12 +452,10 @@ namespace MobileGL::MG_Remote::Server {
// in which the pack state is neutral does not outlive the call.
const MG_Pipe::PixelStoreParameters savedPack =
MG_Pipe::gPipeInputs.GetPixelStoreParameters(/*isUnpack=*/false);
MG_Pipe::MGPPixelPackState neutralPack{};
neutralPack.Pack.RowLength = 0;
neutralPack.Pack.SkipRows = 0;
neutralPack.Pack.SkipPixels = 0;
neutralPack.Pack.SkipImages = 0;
neutralPack.Pack.Alignment = 1;
// MG_Pipe owns the constant (MGPipeTypes.h): in a verify build the compare-at-read hook's
// oracle for the pack half inside this window is the same value, and a second hand-typed
// copy would drift without a build break.
const MG_Pipe::MGPPixelPackState neutralPack = MG_Pipe::MGPipeNeutralReadPixelsPack();
MG_Pipe::MGPipeApplySetPixelPackState(neutralPack);
table->GL.ReadPixels(info.Box.X, info.Box.Y, static_cast<GLsizei>(info.Box.W),