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

dri/common: use HAVE_LIBDRM over __NOT_HAVE_DRM_H

Browse Source 
See previous commit message for details.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov
2015-07-07 15:57:41 +01:00
parent 1c328b8aa7
commit 9ab5b644ef
4 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/drivers/dri/common/Android.mk
View File

@@ -43,10 +43,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(LOCAL_PATH) \ $(LOCAL_PATH) \
$(intermediates) $(intermediates)
# 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
@@ -110,13 +108,6 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_DRI_C_INCLUDES) $(MESA_DRI_C_INCLUDES)
# swrast only
ifeq ($(MESA_GPU_DRIVERS),swrast)
LOCAL_CFLAGS := -D__NOT_HAVE_DRM_H
else
LOCAL_SHARED_LIBRARIES := libdrm
endif
LOCAL_SRC_FILES := $(megadriver_stub_FILES) LOCAL_SRC_FILES := $(megadriver_stub_FILES)
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)

2
src/mesa/drivers/dri/common/Makefile.am
View File

@@ -58,5 +58,5 @@ if DRICOMMON_NEED_LIBDRM
AM_CFLAGS += $(LIBDRM_CFLAGS) AM_CFLAGS += $(LIBDRM_CFLAGS)
libdricommon_la_LIBADD = $(LIBDRM_LIBS) libdricommon_la_LIBADD = $(LIBDRM_LIBS)
else else
AM_CFLAGS += -D__NOT_HAVE_DRM_H AM_CFLAGS += -UHAVE_LIBDRM
endif endif

4
src/mesa/drivers/dri/common/SConscript
View File

@@ -32,10 +32,7 @@ drienv.AppendUnique(LIBS = [
'expat', 'expat',
]) ])
# if HAVE_DRI2
drienv.PkgUseModules('DRM') drienv.PkgUseModules('DRM')
# else
#env.Append(CPPDEFINES = ['__NOT_HAVE_DRM_H'])
sources = drienv.ParseSourceList('Makefile.sources', ['DRI_COMMON_FILES', 'XMLCONFIG_FILES' ]) sources = drienv.ParseSourceList('Makefile.sources', ['DRI_COMMON_FILES', 'XMLCONFIG_FILES' ])
@@ -57,7 +54,6 @@ env.Append(CPPPATH = [
]) ])
env.Append(CPPDEFINES = [ env.Append(CPPDEFINES = [
'__NOT_HAVE_DRM_H',
'HAVE_DLADDR', 'HAVE_DLADDR',
]) ])

4
src/mesa/drivers/dri/common/dri_util.c
View File

@@ -40,7 +40,7 @@
#include <stdbool.h> #include <stdbool.h>
#ifndef __NOT_HAVE_DRM_H #ifdef HAVE_LIBDRM
#include <xf86drm.h> #include <xf86drm.h>
#endif #endif
#include "dri_util.h" #include "dri_util.h"
@@ -137,7 +137,7 @@ driCreateNewScreen2(int scrn, int fd,
setupLoaderExtensions(psp, extensions); setupLoaderExtensions(psp, extensions);
#ifndef __NOT_HAVE_DRM_H #ifdef HAVE_LIBDRM
if (fd != -1) { if (fd != -1) {
drmVersionPtr version = drmGetVersion(fd); drmVersionPtr version = drmGetVersion(fd);
if (version) { if (version) {