From 45eedbec7c6f05b59870e0c37517891ae91d6969 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 1 Sep 2016 18:50:31 -0400 Subject: [PATCH] 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 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/rocclr/runtime/device/pal/palblit.cpp b/rocclr/runtime/device/pal/palblit.cpp index 23fffffe6e..a9925d93c8 100644 --- a/rocclr/runtime/device/pal/palblit.cpp +++ b/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(newpattern);