SWDEV-308644 - merge roc blit kernels

Change-Id: I378e511959fe17c03fa45066022e9670a4d181f0
2021-11-17 18:36:08 -05:00
parent 964f5bc502
commit f5c9ad5b1d
8 changed files with 29 additions and 58 deletions
@@ -356,7 +356,7 @@ Device::BlitProgram::~BlitProgram() {
  }
 }

-bool Device::BlitProgram::create(amd::Device* device, const char* extraKernels,
+bool Device::BlitProgram::create(amd::Device* device, const std::string& extraKernels,
                                 const char* extraOptions) {
  std::vector<amd::Device*> devices;
  devices.push_back(device);
@@ -367,7 +367,7 @@ bool Device::BlitProgram::create(amd::Device* device, const char* extraKernels,
    kernels += image_kernels;
  }

-  if (extraKernels != nullptr) {
+  if (!extraKernels.empty()) {
    kernels += extraKernels;
  }