Skip to content

Commit aa63c4f

Browse files
committed
Revert "GPU: support detection by EGLext"
Works only for NVIDIA GPUs This reverts commits 9ef8580 and 9342d74.
1 parent a378d2a commit aa63c4f

File tree

8 files changed

+0
-77
lines changed

8 files changed

+0
-77
lines changed

CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ set(LIBFASTFETCH_SRC
354354
src/detection/editor/editor.c
355355
src/detection/font/font.c
356356
src/detection/gpu/gpu.c
357-
src/detection/gpu/gpu_eglext.c
358357
src/detection/media/media.c
359358
src/detection/netio/netio.c
360359
src/detection/opencl/opencl.c

doc/json_schema.json

-1
Original file line numberDiff line numberDiff line change
@@ -2041,7 +2041,6 @@
20412041
"pci",
20422042
"vulkan",
20432043
"opencl",
2044-
"eglext",
20452044
"opengl"
20462045
],
20472046
"default": "auto"

src/data/help.json

-1
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,6 @@
11321132
"pci": "Search PCI devices, which do not requires GPU driver installed. Not supported on Windows and macOS",
11331133
"vulkan": "Use Vulkan API. Slow and requires proper vulkan driver installed. Used for Android",
11341134
"opencl": "Use OpenCL API. Slow and requires proper OpenCL driver installed",
1135-
"eglext": "Use extensions of EGL API. Slow but support multiple GPUs",
11361135
"opengl": "Use OpenGL API. Slow and only detects one GPU"
11371136
},
11381137
"default": "auto"

src/detection/gpu/gpu.c

-5
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,6 @@ const char* ffDetectGPU(const FFGPUOptions* options, FFlist* result)
114114
return NULL;
115115
}
116116
}
117-
if (options->detectionMethod <= FF_GPU_DETECTION_METHOD_EGLEXT)
118-
{
119-
if (ffGPUDetectByEglext(result) == NULL)
120-
return NULL;
121-
}
122117
if (options->detectionMethod <= FF_GPU_DETECTION_METHOD_OPENGL)
123118
{
124119
if (detectByOpenGL(result) == NULL)

src/detection/gpu/gpu.h

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ const char* ffDetectGPU(const FFGPUOptions* options, FFlist* result);
4747
const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus);
4848

4949
const char* ffGPUGetVendorString(unsigned vendorId);
50-
const char* ffGPUDetectByEglext(FFlist* gpus);
5150

5251
#if defined(__linux__) || defined(__FreeBSD__) || defined(__sun) || defined(__NetBSD__) || defined(__OpenBSD__)
5352
void ffGPUFillVendorAndName(uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu);

src/detection/gpu/gpu_eglext.c

-62
This file was deleted.

src/modules/gpu/gpu.c

-5
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ bool ffParseGPUCommandOptions(FFGPUOptions* options, const char* key, const char
165165
{ "pci", FF_GPU_DETECTION_METHOD_PCI },
166166
{ "vulkan", FF_GPU_DETECTION_METHOD_VULKAN },
167167
{ "opencl", FF_GPU_DETECTION_METHOD_OPENCL },
168-
{ "eglext", FF_GPU_DETECTION_METHOD_EGLEXT },
169168
{ "opengl", FF_GPU_DETECTION_METHOD_OPENGL },
170169
{},
171170
});
@@ -222,7 +221,6 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module)
222221
{ "pci", FF_GPU_DETECTION_METHOD_PCI },
223222
{ "vulkan", FF_GPU_DETECTION_METHOD_VULKAN },
224223
{ "opencl", FF_GPU_DETECTION_METHOD_OPENCL },
225-
{ "eglext", FF_GPU_DETECTION_METHOD_EGLEXT },
226224
{ "opengl", FF_GPU_DETECTION_METHOD_OPENGL },
227225
{},
228226
});
@@ -282,9 +280,6 @@ void ffGenerateGPUJsonConfig(FFGPUOptions* options, yyjson_mut_doc* doc, yyjson_
282280
case FF_GPU_DETECTION_METHOD_OPENCL:
283281
yyjson_mut_obj_add_str(doc, module, "detectionMethod", "opencl");
284282
break;
285-
case FF_GPU_DETECTION_METHOD_EGLEXT:
286-
yyjson_mut_obj_add_str(doc, module, "detectionMethod", "eglext");
287-
break;
288283
case FF_GPU_DETECTION_METHOD_OPENGL:
289284
yyjson_mut_obj_add_str(doc, module, "detectionMethod", "opengl");
290285
break;

src/modules/gpu/option.h

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ typedef enum __attribute__((__packed__)) FFGPUDetectionMethod
1818
FF_GPU_DETECTION_METHOD_PCI,
1919
FF_GPU_DETECTION_METHOD_VULKAN,
2020
FF_GPU_DETECTION_METHOD_OPENCL,
21-
FF_GPU_DETECTION_METHOD_EGLEXT,
2221
FF_GPU_DETECTION_METHOD_OPENGL,
2322
} FFGPUDetectionMethod;
2423

0 commit comments

Comments
 (0)