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>
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 @@
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;
diff --git a/drv.h b/drv.h
index a42b23e..b3c1c11 100644
--- a/drv.h
+++ b/drv.h
@@ -35,7 +35,6 @@
#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)