diff options
| author | Jamie Gennis <jgennis@google.com> | 2010-08-09 20:00:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-09 20:00:57 -0700 |
| commit | 2d027b459573b6e65f622c29383b8e3efe34ff57 (patch) | |
| tree | 2c2be81eb7397b06837d092eac9cee6694a38d9e | |
| parent | 2ef184507468a8d5e8a102f2683d72210eafa09f (diff) | |
| parent | 972fb8879c46f774daec656b3b1c1f070f04ee3e (diff) | |
| download | msm7k-2d027b459573b6e65f622c29383b8e3efe34ff57.tar.gz | |
am 972fb887: Merge "Change the constant name identifying the NV21 Adreno format." into gingerbread
Merge commit '972fb8879c46f774daec656b3b1c1f070f04ee3e'
* commit '972fb8879c46f774daec656b3b1c1f070f04ee3e':
Change the constant name identifying the NV21 Adreno format.
| -rw-r--r-- | libgralloc-qsd8k/gpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgralloc-qsd8k/gpu.cpp b/libgralloc-qsd8k/gpu.cpp index a5c7442..c838cb6 100644 --- a/libgralloc-qsd8k/gpu.cpp +++ b/libgralloc-qsd8k/gpu.cpp @@ -225,7 +225,7 @@ int gpu_context_t::alloc_impl(int w, int h, int format, int usage, break; // adreno formats - case HAL_PIXEL_FORMAT_YCrCb_420_SP: // NV21 + case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO: // NV21 size = ALIGN(alignedw*alignedh, 4096); size += ALIGN(2 * ALIGN(w/2, 32) * ALIGN(h/2, 32), 4096); break; |