diff options
| author | Chia-I Wu <[email protected]> | 2011-08-25 21:36:19 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-08-27 18:02:11 +0800 |
| commit | 09b5f1fd61bfbb5afdaee81687a9c74c70a62b8a (patch) | |
| tree | e38f04d23943d6a28b5ee0defb2eb50ca4f08fbf /src/gallium/targets | |
| parent | 534df791878ed90cf7c2e4f14482ff03b7c41e77 (diff) | |
android: make DRM optional
For BOARD_GPU_DRIVERS=swrast build, DRM is not needed.
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/egl-static/Android.mk | 13 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/egl.c | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/gallium/targets/egl-static/Android.mk b/src/gallium/targets/egl-static/Android.mk index 8bdbeda61f4..21b6dc27921 100644 --- a/src/gallium/targets/egl-static/Android.mk +++ b/src/gallium/targets/egl-static/Android.mk @@ -39,13 +39,20 @@ LOCAL_C_INCLUDES := \ $(GALLIUM_TOP)/state_trackers/vega \ $(GALLIUM_TOP)/state_trackers/egl \ $(MESA_TOP)/src/egl/main \ - $(MESA_TOP)/src/mesa \ - $(DRM_TOP)/include/drm \ - $(DRM_TOP) + $(MESA_TOP)/src/mesa # swrast LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE +# swrast only +ifeq ($(MESA_GPU_DRIVERS),swrast) +LOCAL_CFLAGS += -D_EGL_NO_DRM +else +LOCAL_C_INCLUDES += \ + $(DRM_TOP)/include/drm \ + $(DRM_TOP) +endif + ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),) LOCAL_CFLAGS += -D_EGL_PIPE_I915=1 endif diff --git a/src/gallium/targets/egl-static/egl.c b/src/gallium/targets/egl-static/egl.c index 5a66e3c34c3..adf1229caba 100644 --- a/src/gallium/targets/egl-static/egl.c +++ b/src/gallium/targets/egl-static/egl.c @@ -109,7 +109,7 @@ out: return (*chip_id >= 0); } -#elif defined(PIPE_OS_ANDROID) +#elif defined(PIPE_OS_ANDROID) && !defined(_EGL_NO_DRM) #include <xf86drm.h> /* for i915 */ |