diff options
| -rw-r--r-- | Android.common.mk | 11 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 7 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 5 |
4 files changed, 21 insertions, 6 deletions
diff --git a/Android.common.mk b/Android.common.mk index 7eefc87..3e97511 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -110,6 +110,17 @@ endif # uncomment to keep the debug symbols #LOCAL_STRIP_MODULE := false +# uncomment for profiling +#LOCAL_CFLAGS += \ +# -DPROFILE \ +# -fno-omit-frame-pointer \ +# -fno-optimize-sibling-calls + +#LOCAL_CPPFLAGS += \ +# -DPROFILE \ +# -fno-omit-frame-pointer \ +# -fno-optimize-sibling-calls + ifeq ($(strip $(LOCAL_MODULE_TAGS)),) LOCAL_MODULE_TAGS := optional endif diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 9f598c9..87bd19b 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -29,7 +29,10 @@ #include <errno.h> #include <dlfcn.h> + +#if 0 #include <xf86drm.h> +#endif #if ANDROID_VERSION >= 0x402 #include <sync/sync.h> @@ -503,7 +506,9 @@ dri2_create_image_android_native_buffer(_EGLDisplay *disp, if (fourcc == -1 || pitch == 0) return NULL; +#if 0 return dri2_create_image_dma_buf(disp, ctx, NULL, attr_list); +#endif } name = get_native_buffer_name(buf); @@ -1075,7 +1080,9 @@ dri2_initialize_android_drm(_EGLDriver *drv, _EGLDisplay *dpy) goto cleanup_driver_name; } +#if 0 dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER; +#endif /* render nodes cannot use Gem names, and thus do not support * the __DRI_DRI2_LOADER extension */ diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk index f0eb18d..d180611 100644 --- a/src/gallium/state_trackers/dri/Android.mk +++ b/src/gallium/state_trackers/dri/Android.mk @@ -44,10 +44,10 @@ ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) LOCAL_SRC_FILES += $(drisw_SOURCES) endif -ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),) +#ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),) LOCAL_SRC_FILES += $(dri2_SOURCES) LOCAL_SHARED_LIBRARIES := libdrm -endif +#endif LOCAL_MODULE := libmesa_st_dri diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 0e93364..e22c79f 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -132,10 +132,7 @@ LOCAL_STATIC_LIBRARIES := ifeq ($(MESA_ENABLE_LLVM),true) LOCAL_STATIC_LIBRARIES += \ - libLLVMR600CodeGen \ - libLLVMR600Desc \ - libLLVMR600Info \ - libLLVMR600AsmPrinter \ + libLLVMExecutionEngine \ libelf LOCAL_LDLIBS += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-lgcc) endif |