mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-17 06:53:22 +09:00
[Fix, Test] (clientfb, MG_Pipe): pass the level a texture respecify redefines - every per-level glTexImage*D and glGenerateMipmap grow took the applier's whole-resource arm and dropped the texture's every pending upload, including a level the applier had accepted at an earlier verb with the client's dirty flag already clear, so L0; draw(other); L1; draw(T) read a black level 0 on the handle arm (final review C-1); the storage entry points now state the scope (one level, a chain cut, the whole resource), the emitter builds wire's MGPRespecifiedLevel with the drain's packed target, a per-level call is never deduped on the descriptor, and the applier drops a named level whether or not the descriptor moved
This commit is contained in:
@@ -66,7 +66,8 @@ namespace MobileGL {
|
||||
// ---- P4a's three client emission points (see TextureObject.h) ----
|
||||
|
||||
void TextureObjectBase::PipePublishDescriptor() {
|
||||
MG_Pipe::MGPipeEmitTextureResourceRespecify(*this);
|
||||
MG_Pipe::MGPipeEmitTextureResourceRespecify(*this, MG_Pipe::MGPipeTextureRespecifyScope::WholeResource,
|
||||
0, 0);
|
||||
// AND THE FRAMEBUFFER AGGREGATE MOVES (P4a fable seam F-3). The resource record
|
||||
// above is only half of what a storage definition changes: set_framebuffer_state
|
||||
// INLINES an attachment's InternalFormat, TextureTarget, extent, Samples and
|
||||
@@ -83,6 +84,24 @@ namespace MobileGL {
|
||||
MGP_NOTE_AGGREGATE(FramebufferAttachment);
|
||||
}
|
||||
|
||||
void TextureObjectBase::PipePublishLevelDescriptor(TextureUploadTarget uploadTarget, Uint mipmapLevel) {
|
||||
// ONE level was (re)allocated: only that level's pending upload is against
|
||||
// storage that is gone (P4a final review C-1). Every other level's stays.
|
||||
MG_Pipe::MGPipeEmitTextureResourceRespecify(*this, MG_Pipe::MGPipeTextureRespecifyScope::OneLevel,
|
||||
static_cast<Uint32>(uploadTarget),
|
||||
static_cast<Uint32>(mipmapLevel));
|
||||
MGP_NOTE_AGGREGATE(FramebufferAttachment); // an attached level's extent is inlined (F-3)
|
||||
}
|
||||
|
||||
void TextureObjectBase::PipePublishTruncatedDescriptor(TextureUploadTarget uploadTarget, Uint levelCount) {
|
||||
// The chain was cut at `levelCount`: the levels above the cut are gone with their
|
||||
// pending uploads, the levels below it are untouched and keep theirs.
|
||||
MG_Pipe::MGPipeEmitTextureResourceRespecify(*this, MG_Pipe::MGPipeTextureRespecifyScope::LevelsFrom,
|
||||
static_cast<Uint32>(uploadTarget),
|
||||
static_cast<Uint32>(levelCount));
|
||||
MGP_NOTE_AGGREGATE(FramebufferAttachment);
|
||||
}
|
||||
|
||||
void TextureObjectBase::PipePublishParams() {
|
||||
MG_Pipe::MGPipeEmitTextureParams(*this);
|
||||
}
|
||||
@@ -492,8 +511,10 @@ namespace MobileGL {
|
||||
// storage-defining GL entry point - glTexImage*, glCompressedTexImage*,
|
||||
// glTexStorage*, glTextureView and the generated-mip storage grow - reaches
|
||||
// storage through here, which is what makes the emission complete without one call
|
||||
// site per entry point in MG_Impl/GLImpl.
|
||||
PipePublishDescriptor();
|
||||
// site per entry point in MG_Impl/GLImpl. AND IT NAMES THE LEVEL (final review
|
||||
// C-1): this call replaced ONE level's storage, and only that level's pending
|
||||
// upload may go with it.
|
||||
PipePublishLevelDescriptor(uploadTarget, mipmapLevel);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -501,7 +522,9 @@ namespace MobileGL {
|
||||
BumpShapeVersion();
|
||||
m_textureStorage.TruncateToLevelCount(GetIndexOfTextureUploadTarget(uploadTarget), levelCount);
|
||||
#if MOBILEGL_PIPE_PUSH
|
||||
PipePublishDescriptor();
|
||||
// The levels at and above the cut are gone; the ones below keep their pending
|
||||
// uploads (final review C-1).
|
||||
PipePublishTruncatedDescriptor(uploadTarget, levelCount);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -221,11 +221,23 @@ namespace MobileGL::MG_State::GLState {
|
||||
// members rather than free calls so the cube's, the view's and the buffer texture's
|
||||
// translation units keep calling an inherited helper.
|
||||
//
|
||||
// resource_respecify. Called from BumpShapeVersion and from the three parameter
|
||||
// resource_respecify, WHOLE-RESOURCE scope: the format setter and the three parameter
|
||||
// setters that move a DESCRIPTOR field without moving the shape (immutable levels,
|
||||
// sample count, fixed sample locations). The emitter dedupes on the built descriptor,
|
||||
// so an over-call costs one 88-byte compare and never an extra record.
|
||||
// sample count, fixed sample locations), and a view's creation. The emitter dedupes
|
||||
// this form on the built descriptor, so an over-call costs one 88-byte compare and
|
||||
// never an extra record.
|
||||
void PipePublishDescriptor();
|
||||
// The PER-LEVEL and the CHAIN-CUT forms of the same call (P4a final review C-1). The
|
||||
// applier keeps a pending-upload set per (uploadTarget, level) and drops the entries
|
||||
// against the storage a respecify REPLACES - and the descriptor cannot tell it which:
|
||||
// AllocateStorage is per level and TruncateMipmapLevels removes a tail, while the
|
||||
// descriptor carries the base extent and the level count only. So the storage entry
|
||||
// points state the scope themselves; the whole-resource form above is for the calls
|
||||
// that really redefine the whole store. A per-level form is NOT deduped on the
|
||||
// descriptor: a non-base level redefined at a new size moves no descriptor field, and
|
||||
// the applier's box against the old level has to go regardless.
|
||||
void PipePublishLevelDescriptor(TextureUploadTarget uploadTarget, Uint mipmapLevel);
|
||||
void PipePublishTruncatedDescriptor(TextureUploadTarget uploadTarget, Uint levelCount);
|
||||
// set_texture_params, from every mutator that bumps m_textureParamsVersion.
|
||||
void PipePublishParams();
|
||||
// The sub-data DRAIN LIST's append, on a level's first dirty mark. There is no clean
|
||||
|
||||
@@ -34,8 +34,9 @@ namespace MobileGL {
|
||||
#if MOBILEGL_PIPE_PUSH
|
||||
// AFTER the allocation, for TextureObjectWithOneMipmap's reason: BumpShapeVersion
|
||||
// runs first and a descriptor built there would describe the level set this call
|
||||
// is about to change.
|
||||
PipePublishDescriptor();
|
||||
// is about to change. The FACE rides in `uploadTarget`, so the key the emitter
|
||||
// drops is that face's level and no other face's (final review C-1).
|
||||
PipePublishLevelDescriptor(uploadTarget, mipmapLevel);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -43,7 +44,7 @@ namespace MobileGL {
|
||||
BumpShapeVersion();
|
||||
m_textureStorage.TruncateToLevelCount(GetIndexOfTextureUploadTarget(uploadTarget), levelCount);
|
||||
#if MOBILEGL_PIPE_PUSH
|
||||
PipePublishDescriptor();
|
||||
PipePublishTruncatedDescriptor(uploadTarget, levelCount);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user