OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: use HAVE_LIBDRM instead of ! __NOT_HAVE_DRM_H

Browse Source 
Double negatives in English language are normally avoided, plus the
former seems cleaner and more consistent.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Emil Velikov
2015-07-07 15:42:15 +01:00
parent 72c784347b
commit 1c328b8aa7
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/loader/Android.mk
View File

@@ -33,10 +33,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LOADER_C_FILES) $(LOADER_C_FILES)
# swrast only ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
ifeq ($(MESA_GPU_DRIVERS),swrast) LOCAL_CFLAGS += -DHAVE_LIBDRM
LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H
else
LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SHARED_LIBRARIES := libdrm
endif endif

5
src/loader/Makefile.am
View File

@@ -48,10 +48,7 @@ libloader_la_CPPFLAGS += \
endif endif
if !HAVE_LIBDRM if HAVE_LIBDRM
libloader_la_CPPFLAGS += \
-D__NOT_HAVE_DRM_H
else
libloader_la_CPPFLAGS += \ libloader_la_CPPFLAGS += \
$(LIBDRM_CFLAGS) $(LIBDRM_CFLAGS)

2
src/loader/SConscript
View File

@@ -8,8 +8,6 @@ env.Prepend(CPPPATH = [
'#include' '#include'
]) ])
env.Append(CPPDEFINES = ['__NOT_HAVE_DRM_H'])
if env['udev']: if env['udev']:
env.PkgUseModules('UDEV') env.PkgUseModules('UDEV')
env.Append(CPPDEFINES = ['HAVE_LIBUDEV']) env.Append(CPPDEFINES = ['HAVE_LIBUDEV'])

8
src/loader/loader.c
View File

@@ -85,7 +85,7 @@
#endif #endif
#include "loader.h" #include "loader.h"
#ifndef __NOT_HAVE_DRM_H #ifdef HAVE_LIBDRM
#include <xf86drm.h> #include <xf86drm.h>
#endif #endif
@@ -505,7 +505,7 @@ sysfs_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
} }
#endif #endif
#if !defined(__NOT_HAVE_DRM_H) #if defined(HAVE_LIBDRM)
/* for i915 */ /* for i915 */
#include <i915_drm.h> #include <i915_drm.h>
/* for radeon */ /* for radeon */
@@ -588,7 +588,7 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id)) if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id))
return 1; return 1;
#endif #endif
#if !defined(__NOT_HAVE_DRM_H) #if HAVE_LIBDRM
if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id)) if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id))
return 1; return 1;
#endif #endif
@@ -699,7 +699,7 @@ loader_get_driver_for_fd(int fd, unsigned driver_types)
if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) { if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) {
#ifndef __NOT_HAVE_DRM_H #if HAVE_LIBDRM
/* fallback to drmGetVersion(): */ /* fallback to drmGetVersion(): */
drmVersionPtr version = drmGetVersion(fd); drmVersionPtr version = drmGetVersion(fd);

2
src/loader/pci_id_driver_map.c
View File

@@ -23,7 +23,7 @@
int is_nouveau_vieux(int fd); int is_nouveau_vieux(int fd);
#ifndef __NOT_HAVE_DRM_H #ifdef HAVE_LIBDRM
#include <xf86drm.h> #include <xf86drm.h>
#include <nouveau_drm.h> #include <nouveau_drm.h>