From d3a8bbdeb5ec3dccf79ae311545cd0617ae10bf8 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 20 Nov 2017 17:44:21 -0500 Subject: [PATCH] P4 to Git Change 1484669 by wchau@wchau_WIN_OCL_HSA on 2017/11/20 17:33:26 SWDEV-138242 - [QR] Screen corruption when opening DVR or Radeon Settings overlay in several apps (PUBG, Dirt3, GoW4, etc) - Fix the mapping entries for 10-bits channel format between the OGL surface formats (hData.format) returned by wglResourceAttachAMD function and the OCL image format. No alpha channel is supported. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevicegl.cpp#8 edit --- rocclr/runtime/device/pal/paldevicegl.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rocclr/runtime/device/pal/paldevicegl.cpp b/rocclr/runtime/device/pal/paldevicegl.cpp index 8df945031e..aff888ee9b 100644 --- a/rocclr/runtime/device/pal/paldevicegl.cpp +++ b/rocclr/runtime/device/pal/paldevicegl.cpp @@ -349,21 +349,21 @@ static const cmFormatXlateParams cmFormatXlateTable[] = { { CM_SURF_FMT_RGBX4, 500, CL_RGB }, { CM_SURF_FMT_RGB5_X1, CL_UNORM_INT16, CL_BGRA }, { CM_SURF_FMT_RGBX8, CL_UNORM_INT8, CL_RGBA }, - { CM_SURF_FMT_RGB10_X2, CL_UNORM_INT_101010, CL_RGBA }, + { CM_SURF_FMT_RGB10_X2, CL_UNORM_INT_101010, CL_RGB }, { CM_SURF_FMT_RGBX16, CL_UNORM_INT16, CL_RGBA }, { CM_SURF_FMT_RGBX16F, CL_HALF_FLOAT, CL_RGBA }, { CM_SURF_FMT_RGBX32F, CL_FLOAT, CL_RGBA }, { CM_SURF_FMT_BGRA4, 500, CL_BGRA }, { CM_SURF_FMT_BGR5_A1, CL_UNSIGNED_INT16, CL_BGRA }, { CM_SURF_FMT_BGRA8, CL_UNORM_INT8, CL_BGRA }, - { CM_SURF_FMT_BGR10_A2, CL_UNORM_INT_101010, CL_BGRA }, + { CM_SURF_FMT_BGR10_A2, 500, CL_BGRA }, { CM_SURF_FMT_BGRA16, CL_UNORM_INT16, CL_BGRA }, { CM_SURF_FMT_BGRA16F, CL_UNORM_INT16, CL_BGRA }, { CM_SURF_FMT_BGRA32F, CL_FLOAT, CL_BGRA }, { CM_SURF_FMT_RGBA4, 500, CL_RGBA }, { CM_SURF_FMT_RGB5_A1, CL_UNSIGNED_INT16, CL_RGBA }, { CM_SURF_FMT_RGBA8, CL_UNORM_INT8, CL_RGBA }, - { CM_SURF_FMT_RGB10_A2, CL_UNORM_INT_101010, CL_RGBA }, + { CM_SURF_FMT_RGB10_A2, CL_UNORM_INT_101010, CL_RGB }, { CM_SURF_FMT_RGBA16, CL_UNORM_INT16, CL_RGBA }, { CM_SURF_FMT_RGBA16F, CL_HALF_FLOAT, CL_RGBA }, { CM_SURF_FMT_RGBA32I, CL_UNSIGNED_INT32, CL_RGBA }, @@ -392,7 +392,7 @@ static const cmFormatXlateParams cmFormatXlateTable[] = { { CM_SURF_FMT_ABGR4, 500, CL_ARGB }, { CM_SURF_FMT_A1_BGR5, CL_UNSIGNED_INT16, CL_ARGB }, { CM_SURF_FMT_ABGR8, CL_UNORM_INT8, CL_ARGB }, - { CM_SURF_FMT_A2_BGR10, CL_UNORM_INT_101010, CL_ARGB }, + { CM_SURF_FMT_A2_BGR10, CL_UNORM_INT_101010, CL_RGB }, { CM_SURF_FMT_ABGR16, CL_UNORM_INT16, CL_ARGB }, { CM_SURF_FMT_ABGR16F, CL_HALF_FLOAT, CL_ARGB }, { CM_SURF_FMT_ABGR32F, CL_FLOAT, CL_ARGB }, @@ -761,7 +761,6 @@ bool Device::resGLAssociate(void* GLContext, uint name, uint type, Pal::OsExtern newClFormat.image_channel_data_type = cmFormatXlateTable[index].image_channel_data_type; newClFormat.image_channel_order = cmFormatXlateTable[index].image_channel_order; - return status; }