diff --git a/projects/clr/rocclr/device/pal/palcdefs b/projects/clr/rocclr/device/pal/palcdefs index 6f33e6e51d..5b2abac85e 100644 --- a/projects/clr/rocclr/device/pal/palcdefs +++ b/projects/clr/rocclr/device/pal/palcdefs @@ -1,3 +1,3 @@ # PAL interface versions -PAL_MAJOR_VERSION = 632 +PAL_MAJOR_VERSION = 656 GPUOPEN_MAJOR_VERSION = 42 diff --git a/projects/clr/rocclr/device/pal/palmemory.cpp b/projects/clr/rocclr/device/pal/palmemory.cpp index 41ee868d4a..81c7e73240 100644 --- a/projects/clr/rocclr/device/pal/palmemory.cpp +++ b/projects/clr/rocclr/device/pal/palmemory.cpp @@ -1135,7 +1135,7 @@ bool Image::ValidateMemory(Resource::MemoryType memType) { !copyImageBuffer_->create(Resource::Local, nullptr, ForceLinear)) { return false; } - constexpr Pal::SubresId ImgSubresId = {Pal::ImageAspect::Color, 0, 0}; + constexpr Pal::SubresId ImgSubresId = {0, 0, 0}; Pal::SubresLayout layout; copyImageBuffer_->image()->GetSubresourceLayout(ImgSubresId, &layout); // Destroy temporary linear image, since it was allocated for the pitch validation only diff --git a/projects/clr/rocclr/device/pal/palresource.cpp b/projects/clr/rocclr/device/pal/palresource.cpp index 6b875a5de8..514c56ba4b 100644 --- a/projects/clr/rocclr/device/pal/palresource.cpp +++ b/projects/clr/rocclr/device/pal/palresource.cpp @@ -483,8 +483,8 @@ void Resource::memTypeToHeap(Pal::GpuMemoryCreateInfo* createInfo) { // ================================================================================================ bool Resource::CreateImage(CreateParams* params, bool forceLinear) { Pal::Result result; - Pal::SubresId ImgSubresId = {Pal::ImageAspect::Color, 0, 0}; - Pal::SubresRange ImgSubresRange = {ImgSubresId, 1, 1}; + Pal::SubresId ImgSubresId = {0, 0, 0}; + Pal::SubresRange ImgSubresRange = {ImgSubresId, 1, 1, 1}; Pal::ChannelMapping channels; Pal::ChNumFormat format = dev().getPalFormat(desc().format_, &channels); @@ -705,8 +705,8 @@ bool Resource::CreateImage(CreateParams* params, bool forceLinear) { // ================================================================================================ bool Resource::CreateInterop(CreateParams* params) { Pal::Result result; - Pal::SubresId ImgSubresId = {Pal::ImageAspect::Color, 0, 0}; - Pal::SubresRange ImgSubresRange = {ImgSubresId, 1, 1}; + Pal::SubresId ImgSubresId = {0, 0, 0}; + Pal::SubresRange ImgSubresRange = {ImgSubresId, 1, 1, 1}; Pal::ChannelMapping channels; Pal::ChNumFormat format = dev().getPalFormat(desc().format_, &channels); Pal::ExternalGpuMemoryOpenInfo gpuMemOpenInfo = {}; @@ -1418,7 +1418,7 @@ bool Resource::partialMemCopyTo(VirtualGPU& gpu, const amd::Coord3D& srcOrigin, gpu.queue(gpu.engineID_).addCmdMemRef(memRef()); gpu.queue(gpu.engineID_).addCmdMemRef(dstResource.memRef()); if (desc().buffer_ && !dstResource.desc().buffer_) { - Pal::SubresId ImgSubresId = {Pal::ImageAspect::Color, dstResource.desc().baseLevel_, 0}; + Pal::SubresId ImgSubresId = {0, dstResource.desc().baseLevel_, 0}; Pal::MemoryImageCopyRegion copyRegion = {}; copyRegion.imageSubres = ImgSubresId; copyRegion.imageOffset.x = dstOrigin[0]; @@ -1443,7 +1443,7 @@ bool Resource::partialMemCopyTo(VirtualGPU& gpu, const amd::Coord3D& srcOrigin, gpu.iCmd()->CmdCopyMemoryToImage(*iMem(), *dstResource.image_, imgLayout, 1, ©Region); } else if (!desc().buffer_ && dstResource.desc().buffer_) { Pal::MemoryImageCopyRegion copyRegion = {}; - Pal::SubresId ImgSubresId = {Pal::ImageAspect::Color, desc().baseLevel_, 0}; + Pal::SubresId ImgSubresId = {0, desc().baseLevel_, 0}; copyRegion.imageSubres = ImgSubresId; copyRegion.imageOffset.x = srcOrigin[0]; copyRegion.imageOffset.y = srcOrigin[1]; @@ -1707,7 +1707,7 @@ void* Resource::gpuMemoryMap(size_t* pitch, uint flags, Pal::IGpuMemory* resourc amd::ScopedLock lk(dev().lockPAL()); void* address; if (image_ != nullptr) { - constexpr Pal::SubresId ImgSubresId = {Pal::ImageAspect::Color, 0, 0}; + constexpr Pal::SubresId ImgSubresId = {0, 0, 0}; Pal::SubresLayout layout; image_->GetSubresourceLayout(ImgSubresId, &layout); *pitch = layout.rowPitch / elementSize(); diff --git a/projects/clr/rocclr/device/pal/palvirtual.hpp b/projects/clr/rocclr/device/pal/palvirtual.hpp index 930591519a..d01efda3d7 100644 --- a/projects/clr/rocclr/device/pal/palvirtual.hpp +++ b/projects/clr/rocclr/device/pal/palvirtual.hpp @@ -488,7 +488,7 @@ class VirtualGPU : public device::VirtualDevice { Pal::BarrierTransition trans = {cacheMask, cacheMask, {nullptr, - {{Pal::ImageAspect::Color, 0, 0}, 0, 0}, + {{0, 0, 0}, 0, 0, 0}, Pal::LayoutShaderRead, Pal::LayoutShaderRead}}; barrier.pTransitions = &trans;