From 5f0124db5cb7de18930b474af7cb722987e088fa Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Fri, 13 Apr 2018 14:05:34 +0100 Subject: COMPMID-959: Fixed clang-tidy formatting, made GLES builds fail for standalone=1 Change-Id: I746ef0b2f8e02349e6067139e90c2c34949cad03 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/127690 Reviewed-by: Michalis Spyrou Tested-by: Jenkins --- SConstruct | 7 ++++++- src/core/CL/CLHelpers.cpp | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index a0acb7bf5f..626a302df6 100644 --- a/SConstruct +++ b/SConstruct @@ -214,7 +214,12 @@ elif env['os'] == 'bare_metal': if env['opencl']: if env['os'] in ['bare_metal'] or env['standalone']: - print("Cannot link OpenCL statically, which is required on bare metal") + print("Cannot link OpenCL statically, which is required for bare metal / standalone builds") + Exit(1) + +if env['gles_compute']: + if env['os'] in ['bare_metal'] or env['standalone']: + print("Cannot link OpenGLES statically, which is required for bare metal / standalone builds") Exit(1) if env['opencl'] or env['gles_compute']: diff --git a/src/core/CL/CLHelpers.cpp b/src/core/CL/CLHelpers.cpp index 378e910f21..71679bcdf0 100644 --- a/src/core/CL/CLHelpers.cpp +++ b/src/core/CL/CLHelpers.cpp @@ -278,7 +278,6 @@ CLVersion get_cl_version(const cl::Device &device) return CLVersion::UNKNOWN; } - bool device_supports_extension(const cl::Device &device, const char *extension_name) { std::string extensions = device.getInfo(); -- cgit v1.2.1