[vlc-commits] [Git][videolan/vlc][master] Revert "opengl: egl_gbm: use DRM_DIR_NAME for path"

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
0b8ce0dd by Rémi Denis-Courmont at 2022-01-08T22:31:42+02:00
Revert "opengl: egl_gbm: use DRM_DIR_NAME for path"

This reverts commit 6218609ae411b6289174521a012e82376329109f.

This broke the build:

../../modules/video_output/opengl/egl_display_gbm.c: In function ‘OpenDeviceFd’:
../../modules/video_output/opengl/egl_display_gbm.c:72:26: error: expected ‘}’ before ‘DRM_RENDER_MINOR_NAME’
   72 |         DRM_DIR_NAME "/" DRM_RENDER_MINOR_NAME "128",
      |                          ^~~~~~~~~~~~~~~~~~~~~
../../modules/video_output/opengl/egl_display_gbm.c:71:53: note: to match this ‘{’
   71 |     static const char *default_drm_device_paths[] = {
      |                                                     ^

- - - - -


2 changed files:

- modules/video_output/opengl/Makefile.am
- modules/video_output/opengl/egl_display_gbm.c


Changes:

=====================================
modules/video_output/opengl/Makefile.am
=====================================
@@ -165,10 +165,6 @@ endif
 libegl_display_gbm_plugin_la_SOURCES = video_output/opengl/egl_display_gbm.c
 libegl_display_gbm_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(EGL_FLAGS) $(GBM_CFLAGS)
 libegl_display_gbm_plugin_la_LIBADD = $(EGL_LIBS) $(GBM_LIBS)
-if HAVE_KMS
-# DRM headers are bringing defines useful for opening DRM devices
-libegl_display_gbm_plugin_la_CPPFLAGS += $(KMS_CFLAGS) -DHAVE_KMS=1
-endif
 if HAVE_EGL
 if HAVE_GBM
 vout_LTLIBRARIES += libegl_display_gbm_plugin.la


=====================================
modules/video_output/opengl/egl_display_gbm.c
=====================================
@@ -31,13 +31,8 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-
 #include <gbm.h>
 
-#ifdef HAVE_KMS
-#include <xf86drm.h>
-#endif
-
 #include "egl_display.h"
 
 struct sys
@@ -62,17 +57,11 @@ static void Close(struct vlc_egl_display *display)
 static int
 OpenDeviceFd(const char **out_path)
 {
-/* DRM_DIR_NAME should be defined in xf86drm.h. */
-#ifndef DRM_DIR_NAME
-# define DRM_DIR_NAME "/dev/dri"
-#endif
-
-    /* Usually, /dev/dri/renderD* or /dev/dri/card* on Linux */
     static const char *default_drm_device_paths[] = {
-        DRM_DIR_NAME "/" DRM_RENDER_MINOR_NAME "128",
-        DRM_DIR_NAME "/" DRM_PRIMARY_MINOR_NAME "0",
-        DRM_DIR_NAME "/" DRM_RENDER_MINOR_NAME "129",
-        DRM_DIR_NAME "/" DRM_PRIMARY_MINOR_NAME "1",
+        "/dev/dri/renderD128",
+        "/dev/dri/card0",
+        "/dev/dri/renderD129",
+        "/dev/dri/card1",
     };
 
     for (size_t i = 0; i < ARRAY_SIZE(default_drm_device_paths); ++i)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0b8ce0dddadb13dacc01e8a6a2c25e9666818902

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0b8ce0dddadb13dacc01e8a6a2c25e9666818902
You're receiving this email because of your account on code.videolan.org.