ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-22 23:29:02 +00:00
Code Packages Projects Releases Wiki Activity

gles: Fix compile errors. (#976)

Browse Source 
* fix gles build error

* fix format check fail

* fix Werror and link error

* gles: Makefile changes

Change-Id: Ie493a730e6004f9251bbf9b534f758e0dc920191

Co-authored-by: Guang <891528583@qq.com>
This commit is contained in:
Sreelakshmi Haridas Maruthur
2020-11-09 04:04:57 -07:00
committed by GitHub
parent 63f01be181
commit 16ddfbb1ae
7 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test_conformance/gles/setup_egl.cpp
View File

@@ -112,11 +112,17 @@ public:
size_t dev_size;
cl_int status;
status = clGetGLContextInfoKHR(properties,
CL_DEVICES_FOR_GL_CONTEXT_KHR,
sizeof(devices),
devices,
&dev_size);
clGetGLContextInfoKHR_fn GetGLContextInfo =
(clGetGLContextInfoKHR_fn)clGetExtensionFunctionAddressForPlatform(
_platform, "clGetGLContextInfoKHR");
if (GetGLContextInfo == NULL)
{
print_error(status, "clGetGLContextInfoKHR failed");
return NULL;
}
status = GetGLContextInfo(properties, CL_DEVICES_FOR_GL_CONTEXT_KHR,
sizeof(devices), devices, &dev_size);
if (status != CL_SUCCESS) {
print_error(status, "clGetGLContextInfoKHR failed");
return NULL;
@@ -124,11 +130,9 @@ public:
dev_size /= sizeof(cl_device_id);
log_info("GL _context supports %d compute devices\n", dev_size);
status = clGetGLContextInfoKHR(properties,
CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR,
sizeof(devices),
devices,
&dev_size);
status =
GetGLContextInfo(properties, CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR,
sizeof(devices), devices, &dev_size);
if (status != CL_SUCCESS) {
print_error(status, "clGetGLContextInfoKHR failed");
return NULL;
@@ -164,9 +168,12 @@ public:
// Check all devices, search for one that supports cl_khr_gl_sharing
for (int i=0; i<(int)num_of_devices; i++) {
if (!is_extension_available(devices[i], "cl_khr_gl_sharing"){
if (!is_extension_available(devices[i], "cl_khr_gl_sharing"))
{
log_info("Device %d of %d does not support required extension cl_khr_gl_sharing.\n", i+1, num_of_devices);
} else {
}
else
{
log_info("Device %d of %d supports required extension cl_khr_gl_sharing.\n", i+1, num_of_devices);
interop_devices++;
}