Only call .put if the tick op was canceled (#7152)

google · Sep 11, 2023 · d328b64 · d328b64
1 parent 3ab7780
commit d328b64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/filament/backend/src/opengl/ShaderCompilerService.cpp b/filament/backend/src/opengl/ShaderCompilerService.cpp
@@ -341,7 +341,7 @@ GLuint ShaderCompilerService::getProgram(ShaderCompilerService::program_token_t&
 
     token->canceled = true;
 
-    token->compiler.cancelTickOp(token);
+    bool canceled = token->compiler.cancelTickOp(token);
 
     if (token->compiler.mShaderCompilerThreadCount) {
         auto job = token->compiler.mCompilerThreadPool.dequeue(token);
@@ -354,7 +354,7 @@ GLuint ShaderCompilerService::getProgram(ShaderCompilerService::program_token_t&
             // order for future callbacks to be successfully called.
             token->compiler.mCallbackManager.put(token->handle);
         }
-    } else {
+    } else if (canceled) {
         // Since the tick op was canceled, we need to .put the token here.
         token->compiler.mCallbackManager.put(token->handle);
     }
@@ -683,17 +683,19 @@ void ShaderCompilerService::runAtNextTick(CompilerPriorityQueue priority,
     SYSTRACE_VALUE32("ShaderCompilerService Jobs", mRunAtNextTickOps.size());
 }
 
-void ShaderCompilerService::cancelTickOp(program_token_t token) noexcept {
+bool ShaderCompilerService::cancelTickOp(program_token_t token) noexcept {
     // We do a linear search here, but this is rare, and we know the list is pretty small.
     auto& ops = mRunAtNextTickOps;
     auto pos = std::find_if(ops.begin(), ops.end(), [&](const auto& item) {
         return std::get<1>(item) == token;
     });
     if (pos != ops.end()) {
         ops.erase(pos);
+        return true;
     }
     SYSTRACE_CONTEXT();
     SYSTRACE_VALUE32("ShaderCompilerService Jobs", ops.size());
+    return false;
 }
 
 void ShaderCompilerService::executeTickOps() noexcept {

diff --git a/filament/backend/src/opengl/ShaderCompilerService.h b/filament/backend/src/opengl/ShaderCompilerService.h
@@ -141,7 +141,7 @@ class ShaderCompilerService {
     void runAtNextTick(CompilerPriorityQueue priority,
             const program_token_t& token, Job job) noexcept;
     void executeTickOps() noexcept;
-    void cancelTickOp(program_token_t token) noexcept;
+    bool cancelTickOp(program_token_t token) noexcept;
     // order of insertion is important
 
     using ContainerType = std::tuple<CompilerPriorityQueue, program_token_t, Job>;