COMPMID-2960: Remove OpenCL and GLES stubs if not used

Change-Id: I429059bb57f90bc657db055e21d39e73a13849eb
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2372
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

7 files changed, 0 insertions, 1331 deletions

diff --git a/SConstruct b/SConstruct
index 8509fedbb3..e63d33e9fd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -304,12 +304,9 @@ for dirname in os.listdir("./include"):
 
 Export('version_at_least')
 
-if env['opencl']:
-    SConscript("./opencl-1.2-stubs/SConscript", variant_dir="%s/opencl-1.2-stubs" % build_path, duplicate=0)
 
 if env['gles_compute'] and env['os'] != 'android':
     env.Append(CPPPATH = ['#/include/linux'])
-    SConscript("./opengles-3.1-stubs/SConscript", variant_dir="%s/opengles-3.1-stubs" % build_path, duplicate=0)
 
 SConscript('./SConscript', variant_dir=build_path, duplicate=0)
 
diff --git a/opencl-1.2-stubs/SConscript b/opencl-1.2-stubs/SConscript
deleted file mode 100644
index da37282fe8..0000000000
--- a/opencl-1.2-stubs/SConscript
+++ /dev/null
@@ -1,5 +0,0 @@
-Import("env")
-
-opencl = env.SharedLibrary("OpenCL", "opencl_stubs.c")
-alias = Alias("opencl", opencl)
-Default(alias)
diff --git a/opencl-1.2-stubs/opencl_stubs.c b/opencl-1.2-stubs/opencl_stubs.c
deleted file mode 100755
index 3bfe3a0016..0000000000
--- a/opencl-1.2-stubs/opencl_stubs.c
+++ /dev/null
@@ -1,1003 +0,0 @@
-#define CL_TARGET_OPENCL_VERSION 200
-#include <CL/cl.h>
-#include <stdio.h>
-
-#define PRINT_STUB_ERROR printf("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\nERROR: %s from stub libOpenCL.so library called! This library can be used to resolve OpenCL symbols at compile time but must *not* be in your runtime path (You need to use a real OpenCL implementation, this one is empty)\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n", __func__)
-
-cl_int
-clGetPlatformIDs(cl_uint          num_entries,
-                 cl_platform_id * platforms,
-                 cl_uint *        num_platforms)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetPlatformInfo(cl_platform_id   platform,
-                  cl_platform_info param_name,
-                  size_t           param_value_size,
-                  void *           param_value,
-                  size_t *         param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetDeviceIDs(cl_platform_id   platform,
-               cl_device_type   device_type,
-               cl_uint          num_entries,
-               cl_device_id *   devices,
-               cl_uint *        num_devices)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetDeviceInfo(cl_device_id    device,
-                cl_device_info  param_name,
-                size_t          param_value_size,
-                void *          param_value,
-                size_t *        param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clCreateSubDevices(cl_device_id                         in_device,
-                   const cl_device_partition_property * properties,
-                   cl_uint                              num_devices,
-                   cl_device_id *                       out_devices,
-                   cl_uint *                            num_devices_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clRetainDevice(cl_device_id device)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clReleaseDevice(cl_device_id device)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_context
-clCreateContext(const cl_context_properties * properties,
-                cl_uint                 num_devices,
-                const cl_device_id *    devices,
-                void (CL_CALLBACK *     pfn_notify)(const char *, const void *, size_t, void *),
-                void *                  user_data,
-                cl_int *                errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_context
-clCreateContextFromType(const cl_context_properties * properties,
-                        cl_device_type                device_type,
-                        void (CL_CALLBACK *           pfn_notify )(const char *, const void *, size_t, void *),
-                        void *                        user_data,
-                        cl_int *                      errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clRetainContext(cl_context context)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clReleaseContext(cl_context context)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetContextInfo(cl_context         context,
-                 cl_context_info    param_name,
-                 size_t             param_value_size,
-                 void *             param_value,
-                 size_t *           param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_command_queue
-clCreateCommandQueue(cl_context                     context,
-                     cl_device_id                   device,
-                     cl_command_queue_properties    properties,
-                     cl_int *                       errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clRetainCommandQueue(cl_command_queue command_queue)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clReleaseCommandQueue(cl_command_queue command_queue)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetCommandQueueInfo(cl_command_queue      command_queue,
-                      cl_command_queue_info param_name,
-                      size_t                param_value_size,
-                      void *                param_value,
-                      size_t *              param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_mem
-clCreateBuffer(cl_context   context,
-               cl_mem_flags flags,
-               size_t       size,
-               void *       host_ptr,
-               cl_int *     errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_mem
-clCreateSubBuffer(cl_mem                   buffer,
-                  cl_mem_flags             flags,
-                  cl_buffer_create_type    buffer_create_type,
-                  const void *             buffer_create_info,
-                  cl_int *                 errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_mem
-clCreateImage(cl_context              context,
-              cl_mem_flags            flags,
-              const cl_image_format * image_format,
-              const cl_image_desc *   image_desc,
-              void *                  host_ptr,
-              cl_int *                errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clRetainMemObject(cl_mem memobj)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clReleaseMemObject(cl_mem memobj)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetSupportedImageFormats(cl_context           context,
-                           cl_mem_flags         flags,
-                           cl_mem_object_type   image_type,
-                           cl_uint              num_entries,
-                           cl_image_format *    image_formats,
-                           cl_uint *            num_image_formats)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetMemObjectInfo(cl_mem           memobj,
-                   cl_mem_info      param_name,
-                   size_t           param_value_size,
-                   void *           param_value,
-                   size_t *         param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetImageInfo(cl_mem           image,
-               cl_image_info    param_name,
-               size_t           param_value_size,
-               void *           param_value,
-               size_t *         param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clSetMemObjectDestructorCallback(  cl_mem memobj,
-                                   void (CL_CALLBACK * pfn_notify)( cl_mem memobj, void* user_data),
-                                   void * user_data )
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_sampler
-clCreateSampler(cl_context          context,
-                cl_bool             normalized_coords,
-                cl_addressing_mode  addressing_mode,
-                cl_filter_mode      filter_mode,
-                cl_int *            errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clRetainSampler(cl_sampler sampler)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clReleaseSampler(cl_sampler sampler)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetSamplerInfo(cl_sampler         sampler,
-                 cl_sampler_info    param_name,
-                 size_t             param_value_size,
-                 void *             param_value,
-                 size_t *           param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_program
-clCreateProgramWithSource(cl_context        context,
-                          cl_uint           count,
-                          const char **     strings,
-                          const size_t *    lengths,
-                          cl_int *          errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_program
-clCreateProgramWithBinary(cl_context                     context,
-                          cl_uint                        num_devices,
-                          const cl_device_id *           device_list,
-                          const size_t *                 lengths,
-                          const unsigned char **         binaries,
-                          cl_int *                       binary_status,
-                          cl_int *                       errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_program
-clCreateProgramWithBuiltInKernels(cl_context            context,
-                                  cl_uint               num_devices,
-                                  const cl_device_id *  device_list,
-                                  const char *          kernel_names,
-                                  cl_int *              errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clRetainProgram(cl_program program)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clReleaseProgram(cl_program program)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clBuildProgram(cl_program           program,
-               cl_uint              num_devices,
-               const cl_device_id * device_list,
-               const char *         options,
-               void (CL_CALLBACK *  pfn_notify)(cl_program program, void * user_data),
-               void *               user_data)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clCompileProgram(cl_program           program,
-                 cl_uint              num_devices,
-                 const cl_device_id * device_list,
-                 const char *         options,
-                 cl_uint              num_input_headers,
-                 const cl_program *   input_headers,
-                 const char **        header_include_names,
-                 void (CL_CALLBACK *  pfn_notify)(cl_program program, void * user_data),
-                 void *               user_data)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_program
-clLinkProgram(cl_context           context,
-              cl_uint              num_devices,
-              const cl_device_id * device_list,
-              const char *         options,
-              cl_uint              num_input_programs,
-              const cl_program *   input_programs,
-              void (CL_CALLBACK *  pfn_notify)(cl_program program, void * user_data),
-              void *               user_data,
-              cl_int *             errcode_ret )
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-
-cl_int
-clUnloadPlatformCompiler(cl_platform_id platform)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetProgramInfo(cl_program         program,
-                 cl_program_info    param_name,
-                 size_t             param_value_size,
-                 void *             param_value,
-                 size_t *           param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetProgramBuildInfo(cl_program            program,
-                      cl_device_id          device,
-                      cl_program_build_info param_name,
-                      size_t                param_value_size,
-                      void *                param_value,
-                      size_t *              param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_kernel
-clCreateKernel(cl_program      program,
-               const char *    kernel_name,
-               cl_int *        errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clCreateKernelsInProgram(cl_program     program,
-                         cl_uint        num_kernels,
-                         cl_kernel *    kernels,
-                         cl_uint *      num_kernels_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clRetainKernel(cl_kernel    kernel)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clReleaseKernel(cl_kernel   kernel)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clSetKernelArg(cl_kernel    kernel,
-               cl_uint      arg_index,
-               size_t       arg_size,
-               const void * arg_value)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetKernelInfo(cl_kernel       kernel,
-                cl_kernel_info  param_name,
-                size_t          param_value_size,
-                void *          param_value,
-                size_t *        param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetKernelArgInfo(cl_kernel           kernel,
-                   cl_uint             arg_indx,
-                   cl_kernel_arg_info  param_name,
-                   size_t              param_value_size,
-                   void *              param_value,
-                   size_t *            param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetKernelWorkGroupInfo(cl_kernel                  kernel,
-                         cl_device_id               device,
-                         cl_kernel_work_group_info  param_name,
-                         size_t                     param_value_size,
-                         void *                     param_value,
-                         size_t *                   param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clWaitForEvents(cl_uint             num_events,
-                const cl_event *    event_list)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetEventInfo(cl_event         event,
-               cl_event_info    param_name,
-               size_t           param_value_size,
-               void *           param_value,
-               size_t *         param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_event
-clCreateUserEvent(cl_context    context,
-                  cl_int *      errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clRetainEvent(cl_event event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clReleaseEvent(cl_event event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clSetUserEventStatus(cl_event   event,
-                     cl_int     execution_status)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clSetEventCallback( cl_event            event,
-                    cl_int              command_exec_callback_type,
-                    void (CL_CALLBACK * pfn_notify)(cl_event, cl_int, void *),
-                    void *              user_data)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clGetEventProfilingInfo(cl_event            event,
-                        cl_profiling_info   param_name,
-                        size_t              param_value_size,
-                        void *              param_value,
-                        size_t *            param_value_size_ret)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clFlush(cl_command_queue command_queue)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clFinish(cl_command_queue command_queue)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueReadBuffer(cl_command_queue    command_queue,
-                    cl_mem              buffer,
-                    cl_bool             blocking_read,
-                    size_t              offset,
-                    size_t              size,
-                    void *              ptr,
-                    cl_uint             num_events_in_wait_list,
-                    const cl_event *    event_wait_list,
-                    cl_event *          event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueReadBufferRect(cl_command_queue    command_queue,
-                        cl_mem              buffer,
-                        cl_bool             blocking_read,
-                        const size_t *      buffer_offset,
-                        const size_t *      host_offset,
-                        const size_t *      region,
-                        size_t              buffer_row_pitch,
-                        size_t              buffer_slice_pitch,
-                        size_t              host_row_pitch,
-                        size_t              host_slice_pitch,
-                        void *              ptr,
-                        cl_uint             num_events_in_wait_list,
-                        const cl_event *    event_wait_list,
-                        cl_event *          event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueWriteBuffer(cl_command_queue   command_queue,
-                     cl_mem             buffer,
-                     cl_bool            blocking_write,
-                     size_t             offset,
-                     size_t             size,
-                     const void *       ptr,
-                     cl_uint            num_events_in_wait_list,
-                     const cl_event *   event_wait_list,
-                     cl_event *         event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueWriteBufferRect(cl_command_queue    command_queue,
-                         cl_mem              buffer,
-                         cl_bool             blocking_write,
-                         const size_t *      buffer_offset,
-                         const size_t *      host_offset,
-                         const size_t *      region,
-                         size_t              buffer_row_pitch,
-                         size_t              buffer_slice_pitch,
-                         size_t              host_row_pitch,
-                         size_t              host_slice_pitch,
-                         const void *        ptr,
-                         cl_uint             num_events_in_wait_list,
-                         const cl_event *    event_wait_list,
-                         cl_event *          event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueFillBuffer(cl_command_queue   command_queue,
-                    cl_mem             buffer,
-                    const void *       pattern,
-                    size_t             pattern_size,
-                    size_t             offset,
-                    size_t             size,
-                    cl_uint            num_events_in_wait_list,
-                    const cl_event *   event_wait_list,
-                    cl_event *         event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueCopyBuffer(cl_command_queue    command_queue,
-                    cl_mem              src_buffer,
-                    cl_mem              dst_buffer,
-                    size_t              src_offset,
-                    size_t              dst_offset,
-                    size_t              size,
-                    cl_uint             num_events_in_wait_list,
-                    const cl_event *    event_wait_list,
-                    cl_event *          event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueCopyBufferRect(cl_command_queue    command_queue,
-                        cl_mem              src_buffer,
-                        cl_mem              dst_buffer,
-                        const size_t *      src_origin,
-                        const size_t *      dst_origin,
-                        const size_t *      region,
-                        size_t              src_row_pitch,
-                        size_t              src_slice_pitch,
-                        size_t              dst_row_pitch,
-                        size_t              dst_slice_pitch,
-                        cl_uint             num_events_in_wait_list,
-                        const cl_event *    event_wait_list,
-                        cl_event *          event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueReadImage(cl_command_queue     command_queue,
-                   cl_mem               image,
-                   cl_bool              blocking_read,
-                   const size_t *       origin,
-                   const size_t *       region,
-                   size_t               row_pitch,
-                   size_t               slice_pitch,
-                   void *               ptr,
-                   cl_uint              num_events_in_wait_list,
-                   const cl_event *     event_wait_list,
-                   cl_event *           event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueWriteImage(cl_command_queue    command_queue,
-                    cl_mem              image,
-                    cl_bool             blocking_write,
-                    const size_t *      origin,
-                    const size_t *      region,
-                    size_t              input_row_pitch,
-                    size_t              input_slice_pitch,
-                    const void *        ptr,
-                    cl_uint             num_events_in_wait_list,
-                    const cl_event *    event_wait_list,
-                    cl_event *          event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueFillImage(cl_command_queue   command_queue,
-                   cl_mem             image,
-                   const void *       fill_color,
-                   const size_t *     origin,
-                   const size_t *     region,
-                   cl_uint            num_events_in_wait_list,
-                   const cl_event *   event_wait_list,
-                   cl_event *         event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueCopyImage(cl_command_queue     command_queue,
-                   cl_mem               src_image,
-                   cl_mem               dst_image,
-                   const size_t *       src_origin,
-                   const size_t *       dst_origin,
-                   const size_t *       region,
-                   cl_uint              num_events_in_wait_list,
-                   const cl_event *     event_wait_list,
-                   cl_event *           event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueCopyImageToBuffer(cl_command_queue command_queue,
-                           cl_mem           src_image,
-                           cl_mem           dst_buffer,
-                           const size_t *   src_origin,
-                           const size_t *   region,
-                           size_t           dst_offset,
-                           cl_uint          num_events_in_wait_list,
-                           const cl_event * event_wait_list,
-                           cl_event *       event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueCopyBufferToImage(cl_command_queue command_queue,
-                           cl_mem           src_buffer,
-                           cl_mem           dst_image,
-                           size_t           src_offset,
-                           const size_t *   dst_origin,
-                           const size_t *   region,
-                           cl_uint          num_events_in_wait_list,
-                           const cl_event * event_wait_list,
-                           cl_event *       event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-void *
-clEnqueueMapBuffer(cl_command_queue command_queue,
-                   cl_mem           buffer,
-                   cl_bool          blocking_map,
-                   cl_map_flags     map_flags,
-                   size_t           offset,
-                   size_t           size,
-                   cl_uint          num_events_in_wait_list,
-                   const cl_event * event_wait_list,
-                   cl_event *       event,
-                   cl_int *         errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-void *
-clEnqueueMapImage(cl_command_queue  command_queue,
-                  cl_mem            image,
-                  cl_bool           blocking_map,
-                  cl_map_flags      map_flags,
-                  const size_t *    origin,
-                  const size_t *    region,
-                  size_t *          image_row_pitch,
-                  size_t *          image_slice_pitch,
-                  cl_uint           num_events_in_wait_list,
-                  const cl_event *  event_wait_list,
-                  cl_event *        event,
-                  cl_int *          errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clEnqueueUnmapMemObject(cl_command_queue command_queue,
-                        cl_mem           memobj,
-                        void *           mapped_ptr,
-                        cl_uint          num_events_in_wait_list,
-                        const cl_event * event_wait_list,
-                        cl_event *       event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueMigrateMemObjects(cl_command_queue       command_queue,
-                           cl_uint                num_mem_objects,
-                           const cl_mem *         mem_objects,
-                           cl_mem_migration_flags flags,
-                           cl_uint                num_events_in_wait_list,
-                           const cl_event *       event_wait_list,
-                           cl_event *             event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueNDRangeKernel(cl_command_queue command_queue,
-                       cl_kernel        kernel,
-                       cl_uint          work_dim,
-                       const size_t *   global_work_offset,
-                       const size_t *   global_work_size,
-                       const size_t *   local_work_size,
-                       cl_uint          num_events_in_wait_list,
-                       const cl_event * event_wait_list,
-                       cl_event *       event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueTask(cl_command_queue  command_queue,
-              cl_kernel         kernel,
-              cl_uint           num_events_in_wait_list,
-              const cl_event *  event_wait_list,
-              cl_event *        event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueNativeKernel(cl_command_queue    command_queue,
-                      void (CL_CALLBACK * user_func)(void *),
-                      void *              args,
-                      size_t              cb_args,
-                      cl_uint             num_mem_objects,
-                      const cl_mem *      mem_list,
-                      const void **       args_mem_loc,
-                      cl_uint             num_events_in_wait_list,
-                      const cl_event *    event_wait_list,
-                      cl_event *          event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueMarkerWithWaitList(cl_command_queue command_queue,
-                            cl_uint          num_events_in_wait_list,
-                            const cl_event * event_wait_list,
-                            cl_event *       event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueBarrierWithWaitList(cl_command_queue command_queue,
-                             cl_uint          num_events_in_wait_list,
-                             const cl_event * event_wait_list,
-                             cl_event *       event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-void *
-clGetExtensionFunctionAddressForPlatform(cl_platform_id platform,
-                                         const char *   func_name)
-{
-	PRINT_STUB_ERROR;
-	return NULL;
-}
-
-
-cl_mem
-clCreateImage2D(cl_context              context,
-                cl_mem_flags            flags,
-                const cl_image_format * image_format,
-                size_t                  image_width,
-                size_t                  image_height,
-                size_t                  image_row_pitch,
-                void *                  host_ptr,
-                cl_int *                errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_mem
-clCreateImage3D(cl_context              context,
-                cl_mem_flags            flags,
-                const cl_image_format * image_format,
-                size_t                  image_width,
-                size_t                  image_height,
-                size_t                  image_depth,
-                size_t                  image_row_pitch,
-                size_t                  image_slice_pitch,
-                void *                  host_ptr,
-                cl_int *                errcode_ret)
-{
-	PRINT_STUB_ERROR;
-	if( errcode_ret ) *errcode_ret = CL_OUT_OF_RESOURCES;
-	return NULL;
-}
-
-cl_int
-clEnqueueMarker(cl_command_queue    command_queue,
-                cl_event *          event)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueWaitForEvents(cl_command_queue command_queue,
-                       cl_uint          num_events,
-                       const cl_event * event_list)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clEnqueueBarrier(cl_command_queue command_queue)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-cl_int
-clUnloadCompiler(void)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
-
-void *
-clGetExtensionFunctionAddress(const char * func_name)
-{
-	PRINT_STUB_ERROR;
-	return NULL;
-}
-
-cl_int
-clSetCommandQueueProperty(cl_command_queue              command_queue,
-                          cl_command_queue_properties   properties,
-                          cl_bool                       enable,
-                          cl_command_queue_properties * old_properties)
-{
-	PRINT_STUB_ERROR;
-	return CL_OUT_OF_RESOURCES;
-}
diff --git a/opengles-3.1-stubs/EGL.c b/opengles-3.1-stubs/EGL.c
deleted file mode 100644
index dc0d4bd989..0000000000
--- a/opengles-3.1-stubs/EGL.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <stdio.h>
-
-#define PRINT_STUB_ERROR printf("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\nERROR: %s from stub libEGL.so library called! This library can be used to resolve OpenGL ES symbols at compile time but must *not* be in your runtime path (You need to use a real OpenGL ES implementation, this one is empty)\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n", __func__)
-
-void eglBindAPI(void) { PRINT_STUB_ERROR; return; }
-void eglBindTexImage(void) { PRINT_STUB_ERROR; return; }
-void eglChooseConfig(void) { PRINT_STUB_ERROR; return; }
-void eglCopyBuffers(void) { PRINT_STUB_ERROR; return; }
-void eglCreateContext(void) { PRINT_STUB_ERROR; return; }
-void eglCreateImageKHR (void) { PRINT_STUB_ERROR; return; }
-void eglCreatePbufferFromClientBuffer(void) { PRINT_STUB_ERROR; return; }
-void eglCreatePbufferSurface(void) { PRINT_STUB_ERROR; return; }
-void eglCreatePixmapSurface(void) { PRINT_STUB_ERROR; return; }
-void eglCreateWindowSurface(void) { PRINT_STUB_ERROR; return; }
-void eglDestroyContext(void) { PRINT_STUB_ERROR; return; }
-void eglDestroyImageKHR (void) { PRINT_STUB_ERROR; return; }
-void eglDestroySurface(void) { PRINT_STUB_ERROR; return; }
-void eglGetConfigAttrib(void) { PRINT_STUB_ERROR; return; }
-void eglGetConfigs(void) { PRINT_STUB_ERROR; return; }
-void eglGetCurrentContext(void) { PRINT_STUB_ERROR; return; }
-void eglGetCurrentDisplay(void) { PRINT_STUB_ERROR; return; }
-void eglGetCurrentSurface(void) { PRINT_STUB_ERROR; return; }
-void eglGetDisplay(void) { PRINT_STUB_ERROR; return; }
-void eglGetError(void) { PRINT_STUB_ERROR; return; }
-void eglGetProcAddress(void) { PRINT_STUB_ERROR; return; }
-void eglInitialize(void) { PRINT_STUB_ERROR; return; }
-void eglMakeCurrent(void) { PRINT_STUB_ERROR; return; }
-void eglQueryAPI(void) { PRINT_STUB_ERROR; return; }
-void eglQueryContext(void) { PRINT_STUB_ERROR; return; }
-void eglQueryString(void) { PRINT_STUB_ERROR; return; }
-void eglQuerySurface(void) { PRINT_STUB_ERROR; return; }
-void eglReleaseTexImage(void) { PRINT_STUB_ERROR; return; }
-void eglReleaseThread(void) { PRINT_STUB_ERROR; return; }
-void eglSurfaceAttrib(void) { PRINT_STUB_ERROR; return; }
-void eglSwapBuffers(void) { PRINT_STUB_ERROR; return; }
-void eglSwapInterval(void) { PRINT_STUB_ERROR; return; }
-void eglTerminate(void) { PRINT_STUB_ERROR; return; }
-void eglWaitClient(void) { PRINT_STUB_ERROR; return; }
-void eglWaitGL(void) { PRINT_STUB_ERROR; return; }
-void eglWaitNative(void) { PRINT_STUB_ERROR; return; }
diff --git a/opengles-3.1-stubs/GLESv2.c b/opengles-3.1-stubs/GLESv2.c
deleted file mode 100644
index c58f0f7772..0000000000
--- a/opengles-3.1-stubs/GLESv2.c
+++ /dev/null
@@ -1,269 +0,0 @@
-#include <stdio.h>
-
-#define PRINT_STUB_ERROR printf("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\nERROR: %s from stub libGLESv2.so library called! This library can be used to resolve OpenGL ES symbols at compile time but must *not* be in your runtime path (You need to use a real OpenGL ES implementation, this one is empty)\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n", __func__)
-
-void glActiveTexture(void) { PRINT_STUB_ERROR; return; }
-void glAttachShader(void) { PRINT_STUB_ERROR; return; }
-void glBindAttribLocation(void) { PRINT_STUB_ERROR; return; }
-void glBindBuffer(void) { PRINT_STUB_ERROR; return; }
-void glBindFramebuffer(void) { PRINT_STUB_ERROR; return; }
-void glBindRenderbuffer(void) { PRINT_STUB_ERROR; return; }
-void glBindTexture(void) { PRINT_STUB_ERROR; return; }
-void glBlendColor(void) { PRINT_STUB_ERROR; return; }
-void glBlendEquation(void) { PRINT_STUB_ERROR; return; }
-void glBlendEquationSeparate(void) { PRINT_STUB_ERROR; return; }
-void glBlendFunc(void) { PRINT_STUB_ERROR; return; }
-void glBlendFuncSeparate(void) { PRINT_STUB_ERROR; return; }
-void glBufferData(void) { PRINT_STUB_ERROR; return; }
-void glBufferSubData(void) { PRINT_STUB_ERROR; return; }
-void glCheckFramebufferStatus(void) { PRINT_STUB_ERROR; return; }
-void glClear(void) { PRINT_STUB_ERROR; return; }
-void glClearColor(void) { PRINT_STUB_ERROR; return; }
-void glClearDepthf(void) { PRINT_STUB_ERROR; return; }
-void glClearStencil(void) { PRINT_STUB_ERROR; return; }
-void glColorMask(void) { PRINT_STUB_ERROR; return; }
-void glCompileShader(void) { PRINT_STUB_ERROR; return; }
-void glCompressedTexImage2D(void) { PRINT_STUB_ERROR; return; }
-void glCompressedTexSubImage2D(void) { PRINT_STUB_ERROR; return; }
-void glCopyTexImage2D(void) { PRINT_STUB_ERROR; return; }
-void glCopyTexSubImage2D(void) { PRINT_STUB_ERROR; return; }
-void glCreateProgram(void) { PRINT_STUB_ERROR; return; }
-void glCreateShader(void) { PRINT_STUB_ERROR; return; }
-void glCullFace(void) { PRINT_STUB_ERROR; return; }
-void glDeleteBuffers(void) { PRINT_STUB_ERROR; return; }
-void glDeleteFramebuffers(void) { PRINT_STUB_ERROR; return; }
-void glDeleteProgram(void) { PRINT_STUB_ERROR; return; }
-void glDeleteRenderbuffers(void) { PRINT_STUB_ERROR; return; }
-void glDeleteShader(void) { PRINT_STUB_ERROR; return; }
-void glDeleteTextures(void) { PRINT_STUB_ERROR; return; }
-void glDepthFunc(void) { PRINT_STUB_ERROR; return; }
-void glDepthMask(void) { PRINT_STUB_ERROR; return; }
-void glDepthRangef(void) { PRINT_STUB_ERROR; return; }
-void glDetachShader(void) { PRINT_STUB_ERROR; return; }
-void glDisable(void) { PRINT_STUB_ERROR; return; }
-void glDisableVertexAttribArray(void) { PRINT_STUB_ERROR; return; }
-void glDrawArrays(void) { PRINT_STUB_ERROR; return; }
-void glDrawElements(void) { PRINT_STUB_ERROR; return; }
-void glEnable(void) { PRINT_STUB_ERROR; return; }
-void glEnableVertexAttribArray(void) { PRINT_STUB_ERROR; return; }
-void glFinish(void) { PRINT_STUB_ERROR; return; }
-void glFlush(void) { PRINT_STUB_ERROR; return; }
-void glFramebufferRenderbuffer(void) { PRINT_STUB_ERROR; return; }
-void glFramebufferTexture2D(void) { PRINT_STUB_ERROR; return; }
-void glFrontFace(void) { PRINT_STUB_ERROR; return; }
-void glGenBuffers(void) { PRINT_STUB_ERROR; return; }
-void glGenerateMipmap(void) { PRINT_STUB_ERROR; return; }
-void glGenFramebuffers(void) { PRINT_STUB_ERROR; return; }
-void glGenRenderbuffers(void) { PRINT_STUB_ERROR; return; }
-void glGenTextures(void) { PRINT_STUB_ERROR; return; }
-void glGetActiveAttrib(void) { PRINT_STUB_ERROR; return; }
-void glGetActiveUniform(void) { PRINT_STUB_ERROR; return; }
-void glGetAttachedShaders(void) { PRINT_STUB_ERROR; return; }
-void glGetAttribLocation(void) { PRINT_STUB_ERROR; return; }
-void glGetBooleanv(void) { PRINT_STUB_ERROR; return; }
-void glGetBufferParameteriv(void) { PRINT_STUB_ERROR; return; }
-void glGetError(void) { PRINT_STUB_ERROR; return; }
-void glGetFloatv(void) { PRINT_STUB_ERROR; return; }
-void glGetFramebufferAttachmentParameteriv(void) { PRINT_STUB_ERROR; return; }
-void glGetIntegerv(void) { PRINT_STUB_ERROR; return; }
-void glGetProgramiv(void) { PRINT_STUB_ERROR; return; }
-void glGetProgramInfoLog(void) { PRINT_STUB_ERROR; return; }
-void glGetRenderbufferParameteriv(void) { PRINT_STUB_ERROR; return; }
-void glGetShaderiv(void) { PRINT_STUB_ERROR; return; }
-void glGetShaderInfoLog(void) { PRINT_STUB_ERROR; return; }
-void glGetShaderPrecisionFormat(void) { PRINT_STUB_ERROR; return; }
-void glGetShaderSource(void) { PRINT_STUB_ERROR; return; }
-void glGetString(void) { PRINT_STUB_ERROR; return; }
-void glGetTexParameterfv(void) { PRINT_STUB_ERROR; return; }
-void glGetTexParameteriv(void) { PRINT_STUB_ERROR; return; }
-void glGetUniformfv(void) { PRINT_STUB_ERROR; return; }
-void glGetUniformiv(void) { PRINT_STUB_ERROR; return; }
-void glGetUniformLocation(void) { PRINT_STUB_ERROR; return; }
-void glGetVertexAttribfv(void) { PRINT_STUB_ERROR; return; }
-void glGetVertexAttribiv(void) { PRINT_STUB_ERROR; return; }
-void glGetVertexAttribPointerv(void) { PRINT_STUB_ERROR; return; }
-void glHint(void) { PRINT_STUB_ERROR; return; }
-void glIsBuffer(void) { PRINT_STUB_ERROR; return; }
-void glIsEnabled(void) { PRINT_STUB_ERROR; return; }
-void glIsFramebuffer(void) { PRINT_STUB_ERROR; return; }
-void glIsProgram(void) { PRINT_STUB_ERROR; return; }
-void glIsRenderbuffer(void) { PRINT_STUB_ERROR; return; }
-void glIsShader(void) { PRINT_STUB_ERROR; return; }
-void glIsTexture(void) { PRINT_STUB_ERROR; return; }
-void glLineWidth(void) { PRINT_STUB_ERROR; return; }
-void glLinkProgram(void) { PRINT_STUB_ERROR; return; }
-void glPixelStorei(void) { PRINT_STUB_ERROR; return; }
-void glPolygonOffset(void) { PRINT_STUB_ERROR; return; }
-void glReadPixels(void) { PRINT_STUB_ERROR; return; }
-void glReleaseShaderCompiler(void) { PRINT_STUB_ERROR; return; }
-void glRenderbufferStorage(void) { PRINT_STUB_ERROR; return; }
-void glSampleCoverage(void) { PRINT_STUB_ERROR; return; }
-void glScissor(void) { PRINT_STUB_ERROR; return; }
-void glShaderBinary(void) { PRINT_STUB_ERROR; return; }
-void glShaderSource(void) { PRINT_STUB_ERROR; return; }
-void glStencilFunc(void) { PRINT_STUB_ERROR; return; }
-void glStencilFuncSeparate(void) { PRINT_STUB_ERROR; return; }
-void glStencilMask(void) { PRINT_STUB_ERROR; return; }
-void glStencilMaskSeparate(void) { PRINT_STUB_ERROR; return; }
-void glStencilOp(void) { PRINT_STUB_ERROR; return; }
-void glStencilOpSeparate(void) { PRINT_STUB_ERROR; return; }
-void glTexImage2D(void) { PRINT_STUB_ERROR; return; }
-void glTexParameterf(void) { PRINT_STUB_ERROR; return; }
-void glTexParameterfv(void) { PRINT_STUB_ERROR; return; }
-void glTexParameteri(void) { PRINT_STUB_ERROR; return; }
-void glTexParameteriv(void) { PRINT_STUB_ERROR; return; }
-void glTexSubImage2D(void) { PRINT_STUB_ERROR; return; }
-void glUniform1f(void) { PRINT_STUB_ERROR; return; }
-void glUniform1fv(void) { PRINT_STUB_ERROR; return; }
-void glUniform1i(void) { PRINT_STUB_ERROR; return; }
-void glUniform1iv(void) { PRINT_STUB_ERROR; return; }
-void glUniform2f(void) { PRINT_STUB_ERROR; return; }
-void glUniform2fv(void) { PRINT_STUB_ERROR; return; }
-void glUniform2i(void) { PRINT_STUB_ERROR; return; }
-void glUniform2iv(void) { PRINT_STUB_ERROR; return; }
-void glUniform3f(void) { PRINT_STUB_ERROR; return; }
-void glUniform3fv(void) { PRINT_STUB_ERROR; return; }
-void glUniform3i(void) { PRINT_STUB_ERROR; return; }
-void glUniform3iv(void) { PRINT_STUB_ERROR; return; }
-void glUniform4f(void) { PRINT_STUB_ERROR; return; }
-void glUniform4fv(void) { PRINT_STUB_ERROR; return; }
-void glUniform4i(void) { PRINT_STUB_ERROR; return; }
-void glUniform4iv(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix2fv(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix3fv(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix4fv(void) { PRINT_STUB_ERROR; return; }
-void glUseProgram(void) { PRINT_STUB_ERROR; return; }
-void glValidateProgram(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttrib1f(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttrib1fv(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttrib2f(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttrib2fv(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttrib3f(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttrib3fv(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttrib4f(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttrib4fv(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttribPointer(void) { PRINT_STUB_ERROR; return; }
-void glViewport(void) { PRINT_STUB_ERROR; return; }
-
-/* OpenGL ES 3.0 */
-
-void glReadBuffer(void) { PRINT_STUB_ERROR; return; }
-void glDrawRangeElements(void) { PRINT_STUB_ERROR; return; }
-void glTexImage3D(void) { PRINT_STUB_ERROR; return; }
-void glTexSubImage3D(void) { PRINT_STUB_ERROR; return; }
-void glCopyTexSubImage3D(void) { PRINT_STUB_ERROR; return; }
-void glCompressedTexImage3D(void) { PRINT_STUB_ERROR; return; }
-void glCompressedTexSubImage3D(void) { PRINT_STUB_ERROR; return; }
-void glGenQueries(void) { PRINT_STUB_ERROR; return; }
-void glDeleteQueries(void) { PRINT_STUB_ERROR; return; }
-void glIsQuery(void) { PRINT_STUB_ERROR; return; }
-void glBeginQuery(void) { PRINT_STUB_ERROR; return; }
-void glEndQuery(void) { PRINT_STUB_ERROR; return; }
-void glGetQueryiv(void) { PRINT_STUB_ERROR; return; }
-void glGetQueryObjectuiv(void) { PRINT_STUB_ERROR; return; }
-void glUnmapBuffer(void) { PRINT_STUB_ERROR; return; }
-void glGetBufferPointerv(void) { PRINT_STUB_ERROR; return; }
-void glDrawBuffers(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix2x3fv(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix3x2fv(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix2x4fv(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix4x2fv(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix3x4fv(void) { PRINT_STUB_ERROR; return; }
-void glUniformMatrix4x3fv(void) { PRINT_STUB_ERROR; return; }
-void glBlitFramebuffer(void) { PRINT_STUB_ERROR; return; }
-void glRenderbufferStorageMultisample(void) { PRINT_STUB_ERROR; return; }
-void glFramebufferTextureLayer(void) { PRINT_STUB_ERROR; return; }
-void glMapBufferRange(void) { PRINT_STUB_ERROR; return; }
-void glFlushMappedBufferRange(void) { PRINT_STUB_ERROR; return; }
-void glBindVertexArray(void) { PRINT_STUB_ERROR; return; }
-void glDeleteVertexArrays(void) { PRINT_STUB_ERROR; return; }
-void glGenVertexArrays(void) { PRINT_STUB_ERROR; return; }
-void glIsVertexArray(void) { PRINT_STUB_ERROR; return; }
-void glGetIntegeri_v(void) { PRINT_STUB_ERROR; return; }
-void glBeginTransformFeedback(void) { PRINT_STUB_ERROR; return; }
-void glEndTransformFeedback(void) { PRINT_STUB_ERROR; return; }
-void glBindBufferRange(void) { PRINT_STUB_ERROR; return; }
-void glBindBufferBase(void) { PRINT_STUB_ERROR; return; }
-void glTransformFeedbackVaryings(void) { PRINT_STUB_ERROR; return; }
-void glGetTransformFeedbackVarying(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttribIPointer(void) { PRINT_STUB_ERROR; return; }
-void glGetVertexAttribIiv(void) { PRINT_STUB_ERROR; return; }
-void glGetVertexAttribIuiv(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttribI4i(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttribI4ui(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttribI4iv(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttribI4uiv(void) { PRINT_STUB_ERROR; return; }
-void glGetUniformuiv(void) { PRINT_STUB_ERROR; return; }
-void glGetFragDataLocation(void) { PRINT_STUB_ERROR; return; }
-void glUniform1ui(void) { PRINT_STUB_ERROR; return; }
-void glUniform2ui(void) { PRINT_STUB_ERROR; return; }
-void glUniform3ui(void) { PRINT_STUB_ERROR; return; }
-void glUniform4ui(void) { PRINT_STUB_ERROR; return; }
-void glUniform1uiv(void) { PRINT_STUB_ERROR; return; }
-void glUniform2uiv(void) { PRINT_STUB_ERROR; return; }
-void glUniform3uiv(void) { PRINT_STUB_ERROR; return; }
-void glUniform4uiv(void) { PRINT_STUB_ERROR; return; }
-void glClearBufferiv(void) { PRINT_STUB_ERROR; return; }
-void glClearBufferuiv(void) { PRINT_STUB_ERROR; return; }
-void glClearBufferfv(void) { PRINT_STUB_ERROR; return; }
-void glClearBufferfi(void) { PRINT_STUB_ERROR; return; }
-void glGetStringi(void) { PRINT_STUB_ERROR; return; }
-void glCopyBufferSubData(void) { PRINT_STUB_ERROR; return; }
-void glGetUniformIndices(void) { PRINT_STUB_ERROR; return; }
-void glGetActiveUniformsiv(void) { PRINT_STUB_ERROR; return; }
-void glGetUniformBlockIndex(void) { PRINT_STUB_ERROR; return; }
-void glGetActiveUniformBlockiv(void) { PRINT_STUB_ERROR; return; }
-void glGetActiveUniformBlockName(void) { PRINT_STUB_ERROR; return; }
-void glUniformBlockBinding(void) { PRINT_STUB_ERROR; return; }
-void glDrawArraysInstanced(void) { PRINT_STUB_ERROR; return; }
-void glDrawElementsInstanced(void) { PRINT_STUB_ERROR; return; }
-void glFenceSync(void) { PRINT_STUB_ERROR; return; }
-void glIsSync(void) { PRINT_STUB_ERROR; return; }
-void glDeleteSync(void) { PRINT_STUB_ERROR; return; }
-void glClientWaitSync(void) { PRINT_STUB_ERROR; return; }
-void glWaitSync(void) { PRINT_STUB_ERROR; return; }
-void glGetInteger64v(void) { PRINT_STUB_ERROR; return; }
-void glGetSynciv(void) { PRINT_STUB_ERROR; return; }
-void glGetInteger64i_v(void) { PRINT_STUB_ERROR; return; }
-void glGetBufferParameteri64v(void) { PRINT_STUB_ERROR; return; }
-void glGenSamplers(void) { PRINT_STUB_ERROR; return; }
-void glDeleteSamplers(void) { PRINT_STUB_ERROR; return; }
-void glIsSampler(void) { PRINT_STUB_ERROR; return; }
-void glBindSampler(void) { PRINT_STUB_ERROR; return; }
-void glSamplerParameteri(void) { PRINT_STUB_ERROR; return; }
-void glSamplerParameteriv(void) { PRINT_STUB_ERROR; return; }
-void glSamplerParameterf(void) { PRINT_STUB_ERROR; return; }
-void glSamplerParameterfv(void) { PRINT_STUB_ERROR; return; }
-void glGetSamplerParameteriv(void) { PRINT_STUB_ERROR; return; }
-void glGetSamplerParameterfv(void) { PRINT_STUB_ERROR; return; }
-void glVertexAttribDivisor(void) { PRINT_STUB_ERROR; return; }
-void glBindTransformFeedback(void) { PRINT_STUB_ERROR; return; }
-void glDeleteTransformFeedbacks(void) { PRINT_STUB_ERROR; return; }
-void glGenTransformFeedbacks(void) { PRINT_STUB_ERROR; return; }
-void glIsTransformFeedback(void) { PRINT_STUB_ERROR; return; }
-void glPauseTransformFeedback(void) { PRINT_STUB_ERROR; return; }
-void glResumeTransformFeedback(void) { PRINT_STUB_ERROR; return; }
-void glGetProgramBinary(void) { PRINT_STUB_ERROR; return; }
-void glProgramBinary(void) { PRINT_STUB_ERROR; return; }
-void glProgramParameteri(void) { PRINT_STUB_ERROR; return; }
-void glInvalidateFramebuffer(void) { PRINT_STUB_ERROR; return; }
-void glInvalidateSubFramebuffer(void) { PRINT_STUB_ERROR; return; }
-void glTexStorage2D(void) { PRINT_STUB_ERROR; return; }
-void glTexStorage3D(void) { PRINT_STUB_ERROR; return; }
-void glGetInternalformativ(void) { PRINT_STUB_ERROR; return; }
-
-/* OpenGL ES 3.1, incomplete */
-
-void glProgramUniform1ui(void) { PRINT_STUB_ERROR; return; }
-void glDispatchCompute(void) { PRINT_STUB_ERROR; return; }
-void glMemoryBarrier(void) { PRINT_STUB_ERROR; return; }
-void glBindImageTexture(void) { PRINT_STUB_ERROR; return; }
-void glProgramUniformMatrix4fv(void) { PRINT_STUB_ERROR; return; }
-void glProgramUniform1f(void) { PRINT_STUB_ERROR; return; }
-void glProgramUniform2f(void) { PRINT_STUB_ERROR; return; }
-void glProgramUniform3f(void) { PRINT_STUB_ERROR; return; }
-void glProgramUniform3fv(void) { PRINT_STUB_ERROR; return; }
-void glProgramUniform4f(void) { PRINT_STUB_ERROR; return; }
-void glDrawElementsIndirect(void) { PRINT_STUB_ERROR; return; }
-
-
diff --git a/opengles-3.1-stubs/Readme.txt b/opengles-3.1-stubs/Readme.txt
deleted file mode 100644
index 4c079b1b38..0000000000
--- a/opengles-3.1-stubs/Readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-These are dummy libraries for linking against at build time.
-The application will require the real device libraries to run.
diff --git a/opengles-3.1-stubs/SConscript b/opengles-3.1-stubs/SConscript
deleted file mode 100644
index c43c6c4cae..0000000000
--- a/opengles-3.1-stubs/SConscript
+++ /dev/null
@@ -1,9 +0,0 @@
-Import("env")
-
-egl = env.SharedLibrary("EGL", "EGL.c")
-alias = Alias("egl", egl)
-Default(alias)
-
-glesv2 = env.SharedLibrary("GLESv2", "GLESv2.c")
-alias = Alias("glesv2", glesv2)
-Default(alias)