diff options
| author | Tomasz Figa <tfiga@chromium.org> | 2017-07-06 18:06:23 +0900 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-07-13 19:45:56 -0700 |
| commit | c869517c0d088c41c8023f7e304b8420db9a7fa6 (patch) | |
| tree | 3f29c8d0f3706312bdda4ca5c9db29ac9f4c6dd2 | |
| parent | 657058557680c8c8ed12e166046b394460199c3d (diff) | |
| download | platform_external_minigbm-c869517c0d088c41c8023f7e304b8420db9a7fa6.tar.gz platform_external_minigbm-c869517c0d088c41c8023f7e304b8420db9a7fa6.tar.bz2 platform_external_minigbm-c869517c0d088c41c8023f7e304b8420db9a7fa6.zip | |
minigbm: gralloc0: Remove BO_USE_HW_CAMERA_ZSL
In gralloc0, the flag GRALLOC_USAGE_HW_CAMERA_ZSL is defined to be a
bitwise OR of GRALLOC_USAGE_HW_CAMERA_WRITE and
GRALLOC_USAGE_HW_CAMERA_READ. So it is incorrect to treat it as a
separate usage flag, not even thinking about using it with the bitwise
AND operator for conditional tests.
Fix the current broken state by removing BO_USE_HW_CAMERA_ZSL, which
does not have any reason to exist.
BUG=b:62358788
TEST=Camera preview renders correctly on Poppy.
Change-Id: I883713f7e1c82c7747b20ac2000fb2edd5207616
Reviewed-on: https://chromium-review.googlesource.com/561034
Commit-Ready: Tomasz Figa <tfiga@chromium.org>
Tested-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Ricky Liang <jcliang@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
| -rw-r--r-- | cros_gralloc/gralloc0/gralloc0.cc | 2 | ||||
| -rw-r--r-- | drv.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/cros_gralloc/gralloc0/gralloc0.cc b/cros_gralloc/gralloc0/gralloc0.cc index abefa89..94b2031 100644 --- a/cros_gralloc/gralloc0/gralloc0.cc +++ b/cros_gralloc/gralloc0/gralloc0.cc @@ -70,8 +70,6 @@ static int64_t gralloc0_convert_flags(int flags) usage |= BO_USE_HW_CAMERA_WRITE; if (flags & GRALLOC_USAGE_HW_CAMERA_READ) usage |= BO_USE_HW_CAMERA_READ; - if (flags & GRALLOC_USAGE_HW_CAMERA_ZSL) - usage |= BO_USE_HW_CAMERA_ZSL; if (flags & GRALLOC_USAGE_RENDERSCRIPT) /* We use CPU for compute. */ usage |= BO_USE_LINEAR; @@ -35,7 +35,6 @@ extern "C" { #define BO_USE_HW_VIDEO_ENCODER (1ull << 12) #define BO_USE_HW_CAMERA_WRITE (1ull << 13) #define BO_USE_HW_CAMERA_READ (1ull << 14) -#define BO_USE_HW_CAMERA_ZSL (1ull << 15) #define BO_USE_RENDERSCRIPT (1ull << 16) #define BO_USE_TEXTURE (1ull << 17) |