From 9181f6da9e37ae5e1038a78ed2d87cda3cde1807 Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Wed, 3 Jun 2015 10:42:38 -0700 Subject: [PATCH] gralloc: Sort usage flags Sorts the usage flags in increasing order so it's easier to see where the gaps are. Bug: 21609491 Change-Id: I98af3c67be84c6c5137767f3cd7a8bd63dfb5c03 (cherry picked from commit fd2d859445d614ab3f6c4687de839097566ac317) --- include/hardware/gralloc.h | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/include/hardware/gralloc.h b/include/hardware/gralloc.h index 93172cd0..ef86f903 100644 --- a/include/hardware/gralloc.h +++ b/include/hardware/gralloc.h @@ -75,7 +75,7 @@ enum { GRALLOC_USAGE_SW_READ_OFTEN = 0x00000003, /* mask for the software read values */ GRALLOC_USAGE_SW_READ_MASK = 0x0000000F, - + /* buffer is never written in software */ GRALLOC_USAGE_SW_WRITE_NEVER = 0x00000000, /* buffer is rarely written in software */ @@ -95,6 +95,21 @@ enum { GRALLOC_USAGE_HW_COMPOSER = 0x00000800, /* buffer will be used with the framebuffer device */ GRALLOC_USAGE_HW_FB = 0x00001000, + + /* buffer should be displayed full-screen on an external display when + * possible */ + GRALLOC_USAGE_EXTERNAL_DISP = 0x00002000, + + /* Must have a hardware-protected path to external display sink for + * this buffer. If a hardware-protected path is not available, then + * either don't composite only this buffer (preferred) to the + * external sink, or (less desirable) do not route the entire + * composition to the external sink. */ + GRALLOC_USAGE_PROTECTED = 0x00004000, + + /* buffer may be used as a cursor */ + GRALLOC_USAGE_CURSOR = 0x00008000, + /* buffer will be used with the HW video encoder */ GRALLOC_USAGE_HW_VIDEO_ENCODER = 0x00010000, /* buffer will be written by the HW camera pipeline */ @@ -111,22 +126,6 @@ enum { /* buffer will be used as a RenderScript Allocation */ GRALLOC_USAGE_RENDERSCRIPT = 0x00100000, - /* buffer should be displayed full-screen on an external display when - * possible - */ - GRALLOC_USAGE_EXTERNAL_DISP = 0x00002000, - - /* Must have a hardware-protected path to external display sink for - * this buffer. If a hardware-protected path is not available, then - * either don't composite only this buffer (preferred) to the - * external sink, or (less desirable) do not route the entire - * composition to the external sink. - */ - GRALLOC_USAGE_PROTECTED = 0x00004000, - - /* buffer may be used as a cursor */ - GRALLOC_USAGE_CURSOR = 0x00008000, - /* Set by the consumer to indicate to the producer that they may attach a * buffer that they did not detach from the BufferQueue. Will be filtered * out by GRALLOC_USAGE_ALLOC_MASK, so gralloc modules will not need to