SWDEV-441201,SWDEV-441727 - Move BlitProgram creation after trap handler build

Change-Id: I89199ccc4bdf79940dc6693e07c03115c52bf613
2024-01-18 23:24:12 +00:00
parent 6af1c419ce
commit 5d322c027a
1 changed files with 9 additions and 9 deletions
@@ -2601,15 +2601,6 @@ bool Device::createBlitProgram() {
    }
  }

-  blitProgram_ = new BlitProgram(context_);
-  // Create blit programs
-  if (blitProgram_ == nullptr || !blitProgram_->create(this, extraBlits, ocl20)) {
-    delete blitProgram_;
-    blitProgram_ = nullptr;
-    LogError("Couldn't create blit kernels!");
-    result = false;
-  }
-
  if (settings().useLightning_) {
    const std::string TrapHandlerAsm = TrapHandlerCode;
    // Create a program for trap handler
@@ -2635,6 +2626,15 @@ bool Device::createBlitProgram() {
      DevLogPrintfError("Trap handler creation failed\n");
    }
  }
+
+  blitProgram_ = new BlitProgram(context_);
+  // Create blit programs
+  if (blitProgram_ == nullptr || !blitProgram_->create(this, extraBlits, ocl20)) {
+    delete blitProgram_;
+    blitProgram_ = nullptr;
+    LogError("Couldn't create blit kernels!");
+    result = false;
+  }
  return result;
 }