mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-19 16:01:57 +09:00
[Refactor, Test] (MG_Impl/Pipe, MG_Test/Pipe): rename ResetForTest to ForgetSession where the session end calls it
This commit is contained in:
@@ -248,8 +248,8 @@ namespace {
|
||||
kMGPipeSubsystemTextureResources | kMGPipeSubsystemSamplers;
|
||||
m_previousContext = MG_State::pGLContext.Take();
|
||||
MG_State::pGLContext = MakeUnique<GLContext>();
|
||||
MGPipeFramebufferEmitterInstance().ResetForTest();
|
||||
MGPipeTextureEmitterInstance().ResetForTest();
|
||||
MGPipeFramebufferEmitterInstance().ForgetSession();
|
||||
MGPipeTextureEmitterInstance().ForgetSession();
|
||||
MGPipeSetHashSuppressorInstance().InvalidateAll();
|
||||
// The applier is a process singleton and its object records outlive a case; with both
|
||||
// families' wired constants set the emissions actually land, so a case must start
|
||||
@@ -259,8 +259,8 @@ namespace {
|
||||
MGPipeApplierReleaseObjectRecords();
|
||||
}
|
||||
~FramebufferScope() {
|
||||
MGPipeFramebufferEmitterInstance().ResetForTest();
|
||||
MGPipeTextureEmitterInstance().ResetForTest();
|
||||
MGPipeFramebufferEmitterInstance().ForgetSession();
|
||||
MGPipeTextureEmitterInstance().ForgetSession();
|
||||
MGPipeSetHashSuppressorInstance().InvalidateAll();
|
||||
MGPipeApplierReset();
|
||||
MGPipeApplierReleaseObjectRecords();
|
||||
@@ -1345,7 +1345,7 @@ TEST(FramebufferEmit, TheBuildMemoReNotesBindBitsAfterTheTextureTableIsDropped)
|
||||
<< "the attachment's RENDER_TARGET bit was never noted";
|
||||
|
||||
// A dropped table (a replaced session) forgets the sticky bits; the next build must note them again.
|
||||
MGPipeTextureEmitterInstance().ResetForTest();
|
||||
MGPipeTextureEmitterInstance().ForgetSession();
|
||||
MGPipeSetHashSuppressorInstance().InvalidateAll();
|
||||
Framebuffers().EmitFramebufferState(Ctx());
|
||||
EXPECT_NE(MGPipeTextureEmitterInstance().TextureBindMask(handle) & kMGPipeBindRenderTarget, 0)
|
||||
|
||||
@@ -581,7 +581,7 @@ void main() { imageStore(img, ivec2(0), vec4(1.0)); }
|
||||
// Nothing produced the bit before the fix round.
|
||||
TEST(ImageEmit, AnImageBoundTextureIsMarkedShaderImageBoundAtTheBind) {
|
||||
EmitterScope scope;
|
||||
MGPipeTextureEmitterInstance().ResetForTest();
|
||||
MGPipeTextureEmitterInstance().ForgetSession();
|
||||
const GLuint name = MakeImageTexture();
|
||||
const auto& texture = Ctx().GetTextureObject(name);
|
||||
ASSERT_TRUE(texture);
|
||||
|
||||
@@ -543,7 +543,7 @@ namespace {
|
||||
static void Clear() {
|
||||
MGPipeSamplerEmitterInstance().Reset();
|
||||
MGPipeSamplerEmitterInstance().ResetCounters();
|
||||
MGPipeSamplerCsoCacheInstance().ResetForTest();
|
||||
MGPipeSamplerCsoCacheInstance().ForgetSession();
|
||||
MGPipeSamplerCsoCacheInstance().ResetCounters();
|
||||
MGPipeSetHashSuppressorInstance().InvalidateAll();
|
||||
}
|
||||
@@ -729,7 +729,7 @@ namespace {
|
||||
|
||||
// The ordinary path, for completeness: two states that differ in ONE field never share
|
||||
// a handle and never reach the confirm at all.
|
||||
Cache().ResetForTest();
|
||||
Cache().ForgetSession();
|
||||
Cache().ResetCounters();
|
||||
const MGPipeHandle plainFirst = Cache().Acquire(first, payload);
|
||||
const MGPipeHandle plainSecond = Cache().Acquire(second, payload);
|
||||
@@ -1193,7 +1193,7 @@ namespace {
|
||||
// Nothing produced the bit before the fix round.
|
||||
TEST(SamplerEmit, AResolvedSamplerViewMarksItsTextureAsSamplerBound) {
|
||||
EmitterScope scope;
|
||||
MGPipeTextureEmitterInstance().ResetForTest();
|
||||
MGPipeTextureEmitterInstance().ForgetSession();
|
||||
namespace GL = MobileGL::MG_Impl::GLImpl;
|
||||
const Uint program = MakeSamplerProgram();
|
||||
GLint linked = 0;
|
||||
|
||||
@@ -233,7 +233,7 @@ namespace {
|
||||
kMGPipeSubsystemResources | kMGPipeSubsystemTextureResources | kMGPipeSubsystemSamplers;
|
||||
m_previousContext = MG_State::pGLContext.Take();
|
||||
MG_State::pGLContext = MakeUnique<GLContext>();
|
||||
MGPipeTextureEmitterInstance().ResetForTest();
|
||||
MGPipeTextureEmitterInstance().ForgetSession();
|
||||
// AND THE APPLIER IS A PROCESS SINGLETON, so its object records outlive a case. With
|
||||
// kMGPipeWiredTextureSubsystem flipped the emitter's calls actually LAND, and a case
|
||||
// that inherited the previous one's records would assert against state it did not
|
||||
@@ -245,7 +245,7 @@ namespace {
|
||||
MGPipeApplierReleaseObjectRecords();
|
||||
}
|
||||
~TextureScope() {
|
||||
MGPipeTextureEmitterInstance().ResetForTest();
|
||||
MGPipeTextureEmitterInstance().ForgetSession();
|
||||
MGPipeApplierReset();
|
||||
MGPipeApplierReleaseObjectRecords();
|
||||
MG_State::pGLContext.reset();
|
||||
|
||||
Reference in New Issue
Block a user