From f095889106f61a5029784550fa44dc0d713b3161 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 24 May 2018 15:56:10 -0400
Subject: [PATCH] P4 to Git Change 1559253 by gandryey@gera-w8 on 2018/05/24
 15:44:23

	SWDEV-79445 - OCL generic changes and code clean-up
	- Following CL#1558704. Fix a regression with AMDIL path. Allocate default device sampler

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#588 edit
---
 rocclr/runtime/device/gpu/gpudevice.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rocclr/runtime/device/gpu/gpudevice.cpp b/rocclr/runtime/device/gpu/gpudevice.cpp
index dbc07c8bef..21779155e3 100644
--- a/rocclr/runtime/device/gpu/gpudevice.cpp
+++ b/rocclr/runtime/device/gpu/gpudevice.cpp
@@ -1623,6 +1623,12 @@ bool Device::createSampler(const amd::Sampler& owner, device::Sampler** sampler)
       return false;
     }
     *sampler = gpuSampler;
+  } else {
+    //! Currently allocate the base device class for AMDIL path
+    *sampler = new device::Sampler();
+    if (*sampler == nullptr) {
+      return false;
+    }
   }
   return true;
 }