P4 to Git Change 1706391 by gandryey@gera-w8 on 2018/11/13 15:31:20

SWDEV-79445 - OCL generic changes and code clean-up
	- Remove mapping of some internal CL formats in PAL backend, since it shouldn't need them anymore.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palblit.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#43 edit


[ROCm/clr commit: eed47ec8b3]

projects/clr/rocclr/runtime/device/pal/palblit.cpp

@@ -747,7 +747,7 @@ static const FormatConvertion RejectedData[] = {
 static const FormatConvertion RejectedOrder[] = {
     {CL_A, CL_R},        {CL_RA, CL_RG},      {CL_LUMINANCE, CL_R}, {CL_INTENSITY, CL_R},
     {CL_RGB, CL_RGBA},   {CL_BGRA, CL_RGBA},  {CL_ARGB, CL_RGBA},   {CL_sRGB, CL_RGBA},
-    {CL_sRGBx, CL_RGBA}, {CL_sRGBA, CL_RGBA}, {CL_sBGRA, CL_RGBA}};
+    {CL_sRGBx, CL_RGBA}, {CL_sRGBA, CL_RGBA}, {CL_sBGRA, CL_RGBA},  {CL_DEPTH, CL_R}};
 
 const uint RejectedFormatDataTotal = sizeof(RejectedData) / sizeof(FormatConvertion);
 const uint RejectedFormatChannelTotal = sizeof(RejectedOrder) / sizeof(FormatConvertion);

projects/clr/rocclr/runtime/device/pal/paldefs.hpp

@@ -390,10 +390,6 @@ static const MemoryFormat MemoryFormatMap[] = {
      Pal::ChNumFormat::X10Y10Z10W2_Unorm,
      {Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::X,
       Pal::ChannelSwizzle::One}},
-    {{CL_RGB, CL_UNSIGNED_INT8},  // This is used only by blit kernel
-     Pal::ChNumFormat::X8Y8Z8W8_Uint,
-     {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
-      Pal::ChannelSwizzle::One}},
 
     // RGBA
     {{CL_RGBA, CL_UNORM_INT8},
@@ -541,59 +537,35 @@ static const MemoryFormat MemoryFormatMap[] = {
      Pal::ChNumFormat::X8Y8Z8W8_Srgb,
      {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
       Pal::ChannelSwizzle::W}},
-    {{CL_sRGBA, CL_UNSIGNED_INT8},  // This is used only by blit kernel
-     Pal::ChNumFormat::X8Y8Z8W8_Uint,
-     {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
-      Pal::ChannelSwizzle::W}},
 
     // sRBG
     {{CL_sRGB, CL_UNORM_INT8},
      Pal::ChNumFormat::X8Y8Z8W8_Srgb,
      {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
       Pal::ChannelSwizzle::One}},
-    {{CL_sRGB, CL_UNSIGNED_INT8},  // This is used only by blit kernel
-     Pal::ChNumFormat::X8Y8Z8W8_Uint,
-     {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
-      Pal::ChannelSwizzle::One}},
 
     // sRBGx
     {{CL_sRGBx, CL_UNORM_INT8},
      Pal::ChNumFormat::X8Y8Z8W8_Srgb,
      {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
       Pal::ChannelSwizzle::One}},
-    {{CL_sRGBx, CL_UNSIGNED_INT8},  // This is used only by blit kernel
-     Pal::ChNumFormat::X8Y8Z8W8_Uint,
-     {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::Z,
-      Pal::ChannelSwizzle::One}},
 
     // sBGRA
     {{CL_sBGRA, CL_UNORM_INT8},
      Pal::ChNumFormat::X8Y8Z8W8_Srgb,
      {Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::X,
       Pal::ChannelSwizzle::W}},
-    {{CL_sBGRA, CL_UNSIGNED_INT8},  // This is used only by blit kernel
-     Pal::ChNumFormat::X8Y8Z8W8_Uint,
-     {Pal::ChannelSwizzle::Z, Pal::ChannelSwizzle::Y, Pal::ChannelSwizzle::X,
-      Pal::ChannelSwizzle::W}},
 
     // DEPTH
     {{CL_DEPTH, CL_FLOAT},
      Pal::ChNumFormat::X32_Float,
      {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
       Pal::ChannelSwizzle::X}},
-    {{CL_DEPTH, CL_UNSIGNED_INT32},  // This is used only by blit kernel
-     Pal::ChNumFormat::X32_Uint,
-     {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
-      Pal::ChannelSwizzle::X}},
 
     {{CL_DEPTH, CL_UNORM_INT16},
      Pal::ChNumFormat::X16_Unorm,
      {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
       Pal::ChannelSwizzle::X}},
-    {{CL_DEPTH, CL_UNSIGNED_INT16},  // This is used only by blit kernel
-     Pal::ChNumFormat::X16_Uint,
-     {Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X, Pal::ChannelSwizzle::X,
-      Pal::ChannelSwizzle::X}},
 
     {{CL_DEPTH_STENCIL, CL_UNORM_INT24},
      Pal::ChNumFormat::X32_Uint,