diff options
author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2012-12-10 22:41:07 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-10 22:41:07 -0800 |
commit | 04470b7fa8fa658417a7b40f904a978c59dc84f1 (patch) | |
tree | 183fc1e09a7d6e8a3b81e4257e5dba5da49ad31c | |
parent | 6ab6c16999e51e67561f1b25e35bb0436916cd73 (diff) | |
parent | 19e59a77d90d963d8a2b3e91daefe59fdeebe3e0 (diff) | |
download | hardware_samsung-04470b7fa8fa658417a7b40f904a978c59dc84f1.zip hardware_samsung-04470b7fa8fa658417a7b40f904a978c59dc84f1.tar.gz hardware_samsung-04470b7fa8fa658417a7b40f904a978c59dc84f1.tar.bz2 |
Merge "gralloc: Back out hacks now that Mali-derping is fixed" into mr1-staging
-rw-r--r-- | exynos4/hal/libgralloc_ump/alloc_device.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/exynos4/hal/libgralloc_ump/alloc_device.cpp b/exynos4/hal/libgralloc_ump/alloc_device.cpp index 65eb717..f2befdd 100644 --- a/exynos4/hal/libgralloc_ump/alloc_device.cpp +++ b/exynos4/hal/libgralloc_ump/alloc_device.cpp @@ -445,21 +445,10 @@ static int alloc_device_alloc(alloc_device_t* dev, int w, int h, int format, } int err; - private_module_t* m = reinterpret_cast<private_module_t*>(dev->common.module); - const uint32_t bufferMask = m->bufferMask; - const uint32_t numBuffers = m->numBuffers; pthread_mutex_lock(&l_surface); - - // Remove the hardware framebuffer flag to avoid lags - usage = usage & ~GRALLOC_USAGE_HW_FB; - -/* - * Using the framebuffer causes lags, so don't use it at all ;-) - * - if (usage & GRALLOC_USAGE_HW_FB && (bufferMask < ((1LU << numBuffers) - 1))) + if (usage & GRALLOC_USAGE_HW_FB) err = gralloc_alloc_framebuffer(dev, size, usage, pHandle, w, h, format, 32); else -*/ err = gralloc_alloc_buffer(dev, size, usage, pHandle, w, h, format, 0, (int)stride_raw, (int)stride); pthread_mutex_unlock(&l_surface); |