From cddfd9e3011ca120f004273f0b96e29c82f3e3bb Mon Sep 17 00:00:00 2001
From: German Andryeyev <German.Andryeyev@amd.com>
Date: Tue, 2 Mar 2021 15:28:51 -0500
Subject: [PATCH] SWDEV-274464 - Enable pitch alignment for imagebuffer only

Change-Id: Icfe67e689f99f0859c997281abf80ae5254852fb
---
 opencl/amdocl/cl_memobj.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/opencl/amdocl/cl_memobj.cpp b/opencl/amdocl/cl_memobj.cpp
index fb7cb6e0de..b6aa6c5267 100644
--- a/opencl/amdocl/cl_memobj.cpp
+++ b/opencl/amdocl/cl_memobj.cpp
@@ -230,8 +230,12 @@ static bool validateImageDescriptor(const std::vector<amd::Device*>& devices,
         }
       }
       if (imageRowPitch == 0) {
-        imageRowPitch = amd::alignUp(desc->image_width,
-                                     devices[0]->info().imagePitchAlignment_) * elemSize;
+        if (desc->mem_object != nullptr) {
+          imageRowPitch = amd::alignUp(desc->image_width,
+                                       devices[0]->info().imagePitchAlignment_) * elemSize;
+        } else {
+          imageRowPitch = desc->image_width * elemSize;
+        }
       }
       break;
     case CL_MEM_OBJECT_IMAGE1D_BUFFER: