diff options
| author | Chia-I Wu <olv@lunarg.com> | 2011-12-03 12:44:05 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2011-12-03 12:44:05 +0800 |
| commit | 700dbd53e873f62cbd8526d4ce8926486dafdb74 (patch) | |
| tree | f0437994458e1af0d91c67a61970cde572a1a466 | |
| parent | 14f249643b86fb86ed9636bf6d8df2619305c469 (diff) | |
Revert "android: enable llvm"android-ics-next
This reverts commit 14f249643b86fb86ed9636bf6d8df2619305c469.
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/android/native_android.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 104425e3c5..c1be083754 100644 --- a/Android.mk +++ b/Android.mk @@ -35,7 +35,7 @@ MESA_LLVM_MK := $(MESA_TOP)/Android.llvm.mk MESA_PYTHON2 := python # enable or disable the use of LLVM -MESA_LLVM := true +MESA_LLVM := false DRM_TOP := external/drm DRM_GRALLOC_TOP := hardware/drm_gralloc diff --git a/src/gallium/state_trackers/egl/android/native_android.cpp b/src/gallium/state_trackers/egl/android/native_android.cpp index eacbdaecb1..01d3a02d36 100644 --- a/src/gallium/state_trackers/egl/android/native_android.cpp +++ b/src/gallium/state_trackers/egl/android/native_android.cpp @@ -540,8 +540,7 @@ android_display_create_window_surface(struct native_display *ndpy, /* request buffers that are for CPU access */ if (!adpy->use_drm) { native_window_set_usage(asurf->win, - GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN | - GRALLOC_USAGE_PRIVATE_0); + GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN); } asurf->base.destroy = android_surface_destroy; |