From c7cad24a0e80c0b198533542ff7b4bcf6913a1f3 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 1 Feb 2019 12:38:48 -0500 Subject: [PATCH] P4 to Git Change 1738908 by gandryey@gera-w8 on 2019/02/01 11:59:05 SWDEV-79445 - OCL generic changes and code clean-up - Separate DVR and Adobe interop paths for RGB101010 format Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl.cpp#63 edit [ROCm/clr commit: 82c35fce203cf6169f9b7703e63836f07dfe112f] --- projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp index e38cfbe141..69a7b0c309 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp @@ -994,13 +994,19 @@ bool getCLFormatFromGL(const Context& amdContext, GLint gliInternalFormat, switch (gliInternalFormat) { case GL_RGB10_EXT: - case GL_RGB10_A2: pclImageFormat->image_channel_order = CL_RGBA; pclImageFormat->image_channel_data_type = CL_UNORM_INT_101010; *piBytesPerPixel = 4; bRetVal = true; break; + case GL_RGB10_A2: + pclImageFormat->image_channel_order = CL_RGB; + pclImageFormat->image_channel_data_type = CL_UNORM_INT_101010; + *piBytesPerPixel = 4; + bRetVal = true; + break; + case GL_BGR8_ATI: case GL_BGRA8_ATI: pclImageFormat->image_channel_order = CL_BGRA;