Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

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: Addressed review 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
OLDNEW
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): Including third_party/khronos/GLES2/gl2.h causes
13 // redefinition errors as macros/functions defined in it conflict with
14 // macros/functions defined in ui/gl/gl_bindings.h. (http://crbug.com/512833).
15 typedef unsigned int GLenum;
16
11 namespace cc { 17 namespace cc {
12 18
13 // Keep in sync with arrays below. 19 // Keep in sync with arrays below.
14 enum ResourceFormat { 20 enum ResourceFormat {
15 RGBA_8888, 21 RGBA_8888,
16 RGBA_4444, 22 RGBA_4444,
17 BGRA_8888, 23 BGRA_8888,
18 ALPHA_8, 24 ALPHA_8,
19 LUMINANCE_8, 25 LUMINANCE_8,
20 RGB_565, 26 RGB_565,
21 ETC1, 27 ETC1,
22 RED_8, 28 RED_8,
23 RESOURCE_FORMAT_MAX = RED_8, 29 RESOURCE_FORMAT_MAX = RED_8,
24 }; 30 };
25 31
26 SkColorType ResourceFormatToSkColorType(ResourceFormat format); 32 SkColorType ResourceFormatToSkColorType(ResourceFormat format);
27 33
34 CC_EXPORT int BitsPerPixel(ResourceFormat format);
35 CC_EXPORT GLenum GLDataType(ResourceFormat format);
36 CC_EXPORT GLenum GLDataFormat(ResourceFormat format);
37 CC_EXPORT GLenum GLInternalFormat(ResourceFormat format);
38
28 } // namespace cc 39 } // namespace cc
29 40
30 #endif // CC_RESOURCES_RESOURCE_FORMAT_H_ 41 #endif // CC_RESOURCES_RESOURCE_FORMAT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698