diff options
| author | Andrew Dodd <atd7@cornell.edu> | 2013-01-13 14:57:43 -0500 |
|---|---|---|
| committer | Andrew Dodd <atd7@cornell.edu> | 2013-01-15 20:09:06 -0500 |
| commit | a7d49af0a901e08b21c8f9bf88b30fce8286b434 (patch) | |
| tree | 8f680e3c916779ae00e96271eabf265e09f13ede | |
| parent | f9f985d6ba644a11458d6051bb3af2e1babb14af (diff) | |
| download | android_hardware_samsung-a7d49af0a901e08b21c8f9bf88b30fce8286b434.tar.gz android_hardware_samsung-a7d49af0a901e08b21c8f9bf88b30fce8286b434.tar.bz2 android_hardware_samsung-a7d49af0a901e08b21c8f9bf88b30fce8286b434.zip | |
gralloc: Remove hackscm-10.1-M1
Stock gralloc doesn't have these alignment hacks. In fact
they currently do nothing and won't until we fix HWC.
Change-Id: I3427cf3fed84a023ba6ed69b0e0fe0b63ea00886
| -rw-r--r-- | exynos4/hal/libgralloc_ump/alloc_device.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/exynos4/hal/libgralloc_ump/alloc_device.cpp b/exynos4/hal/libgralloc_ump/alloc_device.cpp index 1e8ad5d..2110f8d 100644 --- a/exynos4/hal/libgralloc_ump/alloc_device.cpp +++ b/exynos4/hal/libgralloc_ump/alloc_device.cpp @@ -255,22 +255,8 @@ static int gralloc_alloc_buffer(alloc_device_t* dev, size_t size, int usage, hnd->uoffset = ((EXYNOS4_ALIGN(hnd->width, 16) * hnd->height)); hnd->voffset = ((EXYNOS4_ALIGN((hnd->width >> 1), 16) * (hnd->height >> 1))); } else { -#ifndef INSIGNAL_FIMC1 hnd->uoffset = ((EXYNOS4_ALIGN(hnd->width, 16) * EXYNOS4_ALIGN(hnd->height, 16))); hnd->voffset = ((EXYNOS4_ALIGN((hnd->width >> 1), 16) * EXYNOS4_ALIGN((hnd->height >> 1), 16))); -#else - if(usage & GRALLOC_USAGE_HW_FIMC1) { - /* FIMC1 allocs had an additional alignment to a 4k boundary. This solves the issues with - * NHK World Live TV and a few other apps - */ - hnd->uoffset = (EXYNOS4_ALIGN(EXYNOS4_ALIGN(hnd->width, 16) * EXYNOS4_ALIGN(hnd->height, 16)),4096); - hnd->voffset = (EXYNOS4_ALIGN(EXYNOS4_ALIGN((hnd->width >> 1), 16) * EXYNOS4_ALIGN((hnd->height >> 1), 16)),4096); - } - else { - hnd->uoffset = ((EXYNOS4_ALIGN(hnd->width, 16) * EXYNOS4_ALIGN(hnd->height, 16))); - hnd->voffset = ((EXYNOS4_ALIGN((hnd->width >> 1), 16) * EXYNOS4_ALIGN((hnd->height >> 1), 16))); - } -#endif } return 0; } else { |