From 19836499217ed2082167f8ca50114aa2683b52d1 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Mon, 22 Sep 2014 17:11:17 -0400
Subject: [PATCH] P4 to Git Change 1079525 by bwicakso@opencl-hsa-stg-bwicakso
 on 2014/09/22 16:53:56

	ECR #333755 - Disable image support on granite

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.cpp#86 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsasettings.cpp#35 edit


[ROCm/clr commit: a9f1a1f7daf7cb26b9b112665b30324bcaad99b8]
---
 projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp   | 3 ++-
 projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp b/projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp
index 90c7326281..9f30a41ad1 100644
--- a/projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp
+++ b/projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp
@@ -490,7 +490,8 @@ Device::mapHSADeviceToOpenCLDevice(const HsaDevice *dev)
 
     info_.maxWorkGroupSize_ = dev->wave_front_size * dev->max_waves_per_simd;
     info_.maxClockFrequency_ = dev->max_clock_rate_of_f_compute;
-    info_.imageSupport_ = dev->is_image_support;
+    //info_.imageSupport_ = dev->is_image_support;
+    info_.imageSupport_ = false;
 
     info_.localMemSizePerCU_ = dev->group_memory_size;
 
diff --git a/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp b/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
index 9c0ef8d9a4..fc4db222a7 100644
--- a/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
+++ b/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
@@ -45,7 +45,7 @@ Settings::create(bool doublePrecision)
     enableExtension(ClKhrLocalInt32BaseAtomics);
     enableExtension(ClKhrLocalInt32ExtendedAtomics);
     enableExtension(ClExtAtomicCounters32);
-    enableExtension(ClKhr3DImageWrites);
+    //enableExtension(ClKhr3DImageWrites);
     enableExtension(ClKhrGlSharing);
     enableExtension(ClAmdMediaOps);
     enableExtension(ClAmdMediaOps2);
@@ -53,8 +53,8 @@ Settings::create(bool doublePrecision)
     enableExtension(ClKhrD3d10Sharing);
     enableExtension(ClKhrD3d11Sharing);
 #endif // _WIN32
-	enableExtension(ClKhrImage2dFromBuffer);
-	enableExtension(ClAmdImage2dFromBufferReadOnly);
+    //enableExtension(ClKhrImage2dFromBuffer);
+    //enableExtension(ClAmdImage2dFromBufferReadOnly);
     // Make sure device supports doubles
     doublePrecision_ &= doublePrecision;