P4 to Git Change 1310046 by gandryey@gera-w8 on 2016/09/01 18:43:53

SWDEV-101621 - [CQE OCL][OpenCL on PAL] 6 WF Conformance tests are failing
	- Fix fillimage with DEPTH16 format

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palblit.cpp#9 edit

rocclr/runtime/device/pal/palblit.cpp

@@ -2521,8 +2521,7 @@ KernelBlitManager::fillImage(
     bool rejected = false;
     bool    releaseView = false;
     // For depth, we need to create a view
-    if ((memView->desc().format_.image_channel_order == CL_DEPTH) ||
-        (memView->desc().format_.image_channel_order == CL_sRGBA)) {
+    if (memView->desc().format_.image_channel_order == CL_sRGBA) {
         // Find unsupported data type
         for (uint i = 0; i < RejectedFormatDataTotal; ++i) {
             if (RejectedData[i].clOldType_ == newFormat.image_channel_data_type) {
@@ -2532,12 +2531,6 @@ KernelBlitManager::fillImage(
             }
         }
 
-        // Below may not be correct. We need to find why unsigned int view doesn't work for DEPTH16.
-        if ((gpuMem(memory).desc().format_.image_channel_order == CL_DEPTH) &&
-            (gpuMem(memory).desc().format_.image_channel_data_type == CL_UNSIGNED_INT16)) {
-            newFormat.image_channel_data_type = CL_UNORM_INT16;
-        }
-
         if (gpuMem(memory).desc().format_.image_channel_order == CL_sRGBA) {
             // Converting a linear RGB floating-point color value to a 8-bit unsigned integer sRGB value because hw is not support write_imagef for sRGB.
             float *fColor = static_cast<float *>(newpattern);