From 8cec62f4b593d90e1d50acef0405b217abccc228 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 18 Jan 2019 14:41:37 -0500 Subject: [PATCH] P4 to Git Change 1732709 by gandryey@gera-w8 on 2019/01/18 14:18:03 SWDEV-79445 - OCL generic changes and code clean-up - Add 101010 GL interop formats mapping into CL_RGBA. The change will make sure the channel order consistency between OGL and OCL Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl.cpp#62 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#47 edit [ROCm/clr commit: 0b466ae6ff162c60731def52e2652f74f5df7d5f] --- projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp | 2 +- 1 file changed, 1 insertion(+), 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 d8a9bc2ea8..e38cfbe141 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp @@ -995,7 +995,7 @@ bool getCLFormatFromGL(const Context& amdContext, GLint gliInternalFormat, switch (gliInternalFormat) { case GL_RGB10_EXT: case GL_RGB10_A2: - pclImageFormat->image_channel_order = CL_RGB; + pclImageFormat->image_channel_order = CL_RGBA; pclImageFormat->image_channel_data_type = CL_UNORM_INT_101010; *piBytesPerPixel = 4; bRetVal = true;