diff options
author | Caio Schnepper <caioschnepper@gmail.com> | 2015-10-19 21:06:03 -0200 |
---|---|---|
committer | Caio Schnepper <caioschnepper@gmail.com> | 2015-10-19 21:13:45 -0200 |
commit | 2f04f843664bf0b395d40f01456cbf72ab341148 (patch) | |
tree | 7b50b43b443a55e9d857edf1bccc3750e1902c3b | |
parent | d6306fa7d2cd5fa10e338128a0c55f1fb78dc3fd (diff) | |
download | android_hardware_samsung-2f04f843664bf0b395d40f01456cbf72ab341148.tar.gz android_hardware_samsung-2f04f843664bf0b395d40f01456cbf72ab341148.tar.bz2 android_hardware_samsung-2f04f843664bf0b395d40f01456cbf72ab341148.zip |
exynos4: Fix build of hwc and gralloc
HAL_PIXEL_FORMAT_RGBA_5551 and HAL_PIXEL_FORMAT_RGBA_4444 are used
by our hwc and gralloc, but they no longer exist in /system/core/include,
so we are moving these two formats to the hardware specific repo
Change-Id: I1c214af3b9819290173d2d60122d45a8ac635faf
-rw-r--r-- | exynos4/hal/include/graphics.h | 43 | ||||
-rw-r--r-- | exynos4/hal/include/sec_utils.h | 1 | ||||
-rw-r--r-- | exynos4/hal/libgralloc_ump/alloc_device.cpp | 1 |
3 files changed, 45 insertions, 0 deletions
diff --git a/exynos4/hal/include/graphics.h b/exynos4/hal/include/graphics.h new file mode 100644 index 0000000..8579bcb --- /dev/null +++ b/exynos4/hal/include/graphics.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <stdint.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * pixel format definitions + */ + +enum { + /* + * "linear" color pixel formats: + * + * The pixel formats below contain sRGB data but are otherwise treated + * as linear formats, i.e.: no special operation is performed when + * reading or writing into a buffer in one of these formats + */ + HAL_PIXEL_FORMAT_RGBA_5551 = 6, + HAL_PIXEL_FORMAT_RGBA_4444 = 7, +}; + +#ifdef __cplusplus +} +#endif + +/* LEGACY_SYSTEM_CORE_INCLUDE_ANDROID_GRAPHICS_H */ diff --git a/exynos4/hal/include/sec_utils.h b/exynos4/hal/include/sec_utils.h index 046e141..0b52b5c 100644 --- a/exynos4/hal/include/sec_utils.h +++ b/exynos4/hal/include/sec_utils.h @@ -22,6 +22,7 @@ //---------------------------------------------------------// #include <hardware/hardware.h> +#include "graphics.h" #include "sec_format.h" #ifdef __cplusplus diff --git a/exynos4/hal/libgralloc_ump/alloc_device.cpp b/exynos4/hal/libgralloc_ump/alloc_device.cpp index 5478d6b..581b69b 100644 --- a/exynos4/hal/libgralloc_ump/alloc_device.cpp +++ b/exynos4/hal/libgralloc_ump/alloc_device.cpp @@ -36,6 +36,7 @@ #include <hardware/hardware.h> #include <hardware/gralloc.h> #include "sec_format.h" +#include "graphics.h" #include "gralloc_priv.h" #include "gralloc_helper.h" |