diff --git a/projects/clr/rocclr/runtime/device/pal/palblit.cpp b/projects/clr/rocclr/runtime/device/pal/palblit.cpp index 43b0ecd860..3a5d3c2385 100644 --- a/projects/clr/rocclr/runtime/device/pal/palblit.cpp +++ b/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); diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp index 941adc8a07..fd64e86d65 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp +++ b/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,