From e28f2a3e71776c48fa82cf351085ce50cbbc62b2 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 7 Mar 2019 10:58:16 -0500 Subject: [PATCH] P4 to Git Change 1752821 by gandryey@gera-w8 on 2019/03/07 10:48:10 SWDEV-180834 - [Forum] - Washed-Out Colors in Premiere Pro CC 2018 When 10bit Enabled - Correct OGL->OCL mapping for CM_SURF_FMT_RGB10_X2 format Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp#33 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevicegl.cpp#10 edit [ROCm/clr commit: 2df067619fc6b3c5830a7e49d14995985729e465] --- .../clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp | 2 +- projects/clr/rocclr/runtime/device/pal/paldevicegl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp index 0567fac016..24d500e97d 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDeviceGL.cpp @@ -51,7 +51,7 @@ static const cmFormatXlateParams cmFormatXlateTable [] = { {CM_SURF_FMT_RGBX4, (cmSurfFmt)500, GSL_CHANNEL_ORDER_RGBA}, {CM_SURF_FMT_RGB5_X1, CM_SURF_FMT_BGR5_X1, GSL_CHANNEL_ORDER_RGBA}, {CM_SURF_FMT_RGBX8, CM_SURF_FMT_RGBA8, GSL_CHANNEL_ORDER_RGBA}, - {CM_SURF_FMT_RGB10_X2, CM_SURF_FMT_BGR10_X2, GSL_CHANNEL_ORDER_RGBA}, + {CM_SURF_FMT_RGB10_X2, CM_SURF_FMT_RGB10_X2, GSL_CHANNEL_ORDER_RGBA}, {CM_SURF_FMT_RGBX16, CM_SURF_FMT_RGBA16, GSL_CHANNEL_ORDER_RGBA}, {CM_SURF_FMT_RGBX16F, CM_SURF_FMT_RGBA16F, GSL_CHANNEL_ORDER_RGBA}, {CM_SURF_FMT_RGBX32F, CM_SURF_FMT_RGBA32F, GSL_CHANNEL_ORDER_RGBA}, diff --git a/projects/clr/rocclr/runtime/device/pal/paldevicegl.cpp b/projects/clr/rocclr/runtime/device/pal/paldevicegl.cpp index 75826918e1..ac209191ca 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevicegl.cpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevicegl.cpp @@ -349,7 +349,7 @@ 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_RGB }, + { CM_SURF_FMT_RGB10_X2, CL_UNORM_INT_101010, CL_RGBA }, { 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 },