Fix assert in GrMaskFormatBytesPerPixel.

Fix assert in GrMaskFormatBytesPerPixel.

BUG=skia:3174
Committed: https://skia.googlesource.com/skia/+/5eefe42e727aad1884d048f07785576e7015db08

[jvanverth1, 2014-11-26 17:31:43]

jvanverth@google.com changed reviewers:
+ robertphillips@google.com

[robertphillips, 2014-11-26 18:19:36]

lgtm + bikeshedding

https://codereview.chromium.org/762553006/diff/1/include/gpu/GrTypes.h
File include/gpu/GrTypes.h (right):

https://codereview.chromium.org/762553006/diff/1/include/gpu/GrTypes.h#newcod...
include/gpu/GrTypes.h:243: // kA565 (1) -> 2
(2) ?

https://codereview.chromium.org/762553006/diff/1/include/gpu/GrTypes.h#newcod...
include/gpu/GrTypes.h:245: static const int sBytesPerPixel[] = { 1, 2, 4 };
Why SK_ARRAY_COUNT(sBytesPerPixel) instead of kMaskFormatCount ?

https://codereview.chromium.org/762553006/diff/1/include/gpu/GrTypes.h#newcod...
include/gpu/GrTypes.h:247: SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sBytesPerPixel) ==
kMaskFormatCount, array_size_mismatch);
Seems like we also need:

SK_COMPILE_ASSERT(kA8_GrMaskFormat == 0, enum_order_dependency);
SK_COMPILE_ASSERT(kA565_GrMaskFormat == 1, enum_order_dependency);
SK_COMPILE_ASSERT(kARGB_GrMaskFormat == 2, enum_order_dependency);

Also, shouldn't it be k565_GrMaskFormat? Where is the 'A' coming from?

[jvanverth1, 2014-11-26 19:21:49]

https://codereview.chromium.org/762553006/diff/1/include/gpu/GrTypes.h
File include/gpu/GrTypes.h (right):

https://codereview.chromium.org/762553006/diff/1/include/gpu/GrTypes.h#newcod...
include/gpu/GrTypes.h:243: // kA565 (1) -> 2
On 2014/11/26 18:19:35, robertphillips wrote:
> (2) ?

Done.

https://codereview.chromium.org/762553006/diff/1/include/gpu/GrTypes.h#newcod...
include/gpu/GrTypes.h:245: static const int sBytesPerPixel[] = { 1, 2, 4 };
On 2014/11/26 18:19:35, robertphillips wrote:
> Why SK_ARRAY_COUNT(sBytesPerPixel) instead of kMaskFormatCount ?

Done.

https://codereview.chromium.org/762553006/diff/1/include/gpu/GrTypes.h#newcod...
include/gpu/GrTypes.h:247: SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sBytesPerPixel) ==
kMaskFormatCount, array_size_mismatch);
On 2014/11/26 18:19:35, robertphillips wrote:
> Seems like we also need:
> 
> SK_COMPILE_ASSERT(kA8_GrMaskFormat == 0, enum_order_dependency);
> SK_COMPILE_ASSERT(kA565_GrMaskFormat == 1, enum_order_dependency);
> SK_COMPILE_ASSERT(kARGB_GrMaskFormat == 2, enum_order_dependency);

Done.

> Also, shouldn't it be k565_GrMaskFormat? Where is the 'A' coming from?

It's a little weird, but this is the LCD format. RGB represents coverage in the
three different channels, so A sort of makes sense.

[jvanverth1, 2014-11-26 19:21:54]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2014-11-26 19:22:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/762553006/20001

[commit-bot: I haz the power, 2014-11-26 19:22:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-26 19:22:49]

Presubmit check for 762553006-20001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Since the CL is editing public API, you must have an LGTM from one of:
('reed@chromium.org', 'reed@google.com', 'bsalomon@chromium.org',
'bsalomon@google.com', 'djsollen@chromium.org', 'djsollen@google.com')

[jvanverth1, 2014-11-26 19:25:37]

jvanverth@google.com changed reviewers:
+ bsalomon@google.com

[jvanverth1, 2014-11-26 19:25:56]

Adding bsalomon@.

[bsalomon, 2014-11-26 19:56:06]

lgtm

[jvanverth1, 2014-11-26 19:56:50]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2014-11-26 19:57:12]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/762553006/20001

[commit-bot: I haz the power, 2014-11-26 20:07:42]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/5eefe42e727aad1884d048f07785576e7015db08