cc/resources/resource_format.h - Issue 1202843008: cc: Fix BytesPerPixel issue and refactor.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: cc/resources/resource_format.h

Issue 1202843008: cc: Fix BytesPerPixel issue and refactor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Corrected comments. Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CC_RESOURCES_RESOURCE_FORMAT_H_	5 #ifndef CC_RESOURCES_RESOURCE_FORMAT_H_

6 #define CC_RESOURCES_RESOURCE_FORMAT_H_	6 #define CC_RESOURCES_RESOURCE_FORMAT_H_

7	7

8 #include "base/logging.h"	8 #include "base/logging.h"

	9 #include "cc/base/cc_export.h"

9 #include "third_party/skia/include/core/SkBitmap.h"	10 #include "third_party/skia/include/core/SkBitmap.h"

10	11

	12 // TODO(prashant.n): Remove GLenum typedef.
	vmpstr 2015/07/16 19:04:00 Can you file a bug for this and reference it in th Can you file a bug for this and reference it in the comment
	13 typedef unsigned int GLenum;

	14

11 namespace cc {	15 namespace cc {

12	16

13 // Keep in sync with arrays below.	17 // Keep in sync with arrays below.

14 enum ResourceFormat {	18 enum ResourceFormat {

15 RGBA_8888,	19 RGBA_8888,

16 RGBA_4444,	20 RGBA_4444,

17 BGRA_8888,	21 BGRA_8888,

18 ALPHA_8,	22 ALPHA_8,

19 LUMINANCE_8,	23 LUMINANCE_8,

20 RGB_565,	24 RGB_565,

21 ETC1,	25 ETC1,

22 RED_8,	26 RED_8,

23 RESOURCE_FORMAT_MAX = RED_8,	27 RESOURCE_FORMAT_MAX = RED_8,

24 };	28 };

25	29

26 SkColorType ResourceFormatToSkColorType(ResourceFormat format);	30 SkColorType ResourceFormatToSkColorType(ResourceFormat format);

27	31

	32 CC_EXPORT extern int BitsPerPixel(ResourceFormat format);
	vmpstr 2015/07/16 19:04:00 I don't think you need extern here? I don't think you need extern here?
	33 CC_EXPORT extern GLenum GLDataType(ResourceFormat format);

	34 CC_EXPORT extern GLenum GLDataFormat(ResourceFormat format);

	35 CC_EXPORT extern GLenum GLInternalFormat(ResourceFormat format);

	36

28 } // namespace cc	37 } // namespace cc

29	38

30 #endif // CC_RESOURCES_RESOURCE_FORMAT_H_	39 #endif // CC_RESOURCES_RESOURCE_FORMAT_H_

OLD	NEW

« no previous file with comments | « cc/resources/resource.h ('k') | cc/resources/resource_format.cc » ('j') | cc/resources/resource_format.cc » ('J')