fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Don't require FF_HAVE_OPENCL on Apple

Browse Source
This commit is contained in:
Linus Dierheimer
2022-09-14 22:03:23 +02:00
parent 6f60423c60
commit 545210e25e
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-4
View File
@@ -325,10 +325,6 @@ if(APPLE)
PRIVATE "-framework OpenGL"
PRIVATE "-framework OpenCL"
)
target_compile_definitions(libfastfetch
PRIVATE FF_HAVE_OPENCL=1
)
endif()
target_include_directories(libfastfetch
src/modules/opencl.c
+27 -20
View File
@@ -4,16 +4,16 @@
#define FF_OPENCL_MODULE_NAME "OpenCL"
#define FF_OPENCL_NUM_FORMAT_ARGS 3
#ifdef FF_HAVE_OPENCL
#if defined(FF_HAVE_OPENCL) || defined(__APPLE__)
#include "common/library.h"
#include "common/parsing.h"
#include <string.h>
#define CL_TARGET_OPENCL_VERSION 100
#ifdef __APPLE__
#include <OpenCL/cl.h>
#include <OpenCL/cl.h>
#else
#include <CL/cl.h>
#include <CL/cl.h>
#endif
typedef struct OpenCLData
@@ -75,36 +75,43 @@ static const char* openCLHandelData(FFinstance* instance, OpenCLData* data)
return NULL;
}
#endif // FF_HAVE_OPENCL || __APPLE__
#ifdef FF_HAVE_OPENCL
static const char* printOpenCL(FFinstance* instance)
{
OpenCLData data;
#ifdef __APPLE__
data.ffclGetPlatformIDs = clGetPlatformIDs;
data.ffclGetDeviceIDs = clGetDeviceIDs;
data.ffclGetDeviceInfo = clGetDeviceInfo;
#else
FF_LIBRARY_LOAD(opencl, instance->config.libOpenCL, "dlopen libOpenCL.so failed", "libOpenCL.so", 1);
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetPlatformIDs);
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetDeviceIDs);
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetDeviceInfo);
#endif
FF_LIBRARY_LOAD(opencl, instance->config.libOpenCL, "dlopen libOpenCL.so failed", "libOpenCL.so", 1);
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetPlatformIDs);
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetDeviceIDs);
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(opencl, data, clGetDeviceInfo);
const char* error = openCLHandelData(instance, &data);
#ifndef __APPLE__
dlclose(opencl);
#endif
dlclose(opencl);
return error;
}
#endif
#elif __APPLE__ // FF_HAVE_OPENCL
static const char* printOpenCL(FFinstance* instance)
{
OpenCLData data;
data.ffclGetPlatformIDs = clGetPlatformIDs;
data.ffclGetDeviceIDs = clGetDeviceIDs;
data.ffclGetDeviceInfo = clGetDeviceInfo;
return openCLHandelData(instance, &data);
}
#endif // __APPLE__
void ffPrintOpenCL(FFinstance* instance)
{
const char* error;
#ifdef FF_HAVE_OPENCL
#if defined(FF_HAVE_OPENCL) || defined(__APPLE__)
error = printOpenCL(instance);
#else
error = "Fastfetch was build without OpenCL support";