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

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

Issue 1273163004: Revert of cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « cc/raster/tile_task_worker_pool_unittest.cc ('k') | cc/resources/resource_format.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "cc/base/cc_export.h"
10 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
11 #include "ui/gfx/gpu_memory_buffer.h"
12 11
13 // TODO(prashant.n): Including third_party/khronos/GLES2/gl2.h causes 12 // TODO(prashant.n): Including third_party/khronos/GLES2/gl2.h causes
14 // redefinition errors as macros/functions defined in it conflict with 13 // redefinition errors as macros/functions defined in it conflict with
15 // macros/functions defined in ui/gl/gl_bindings.h. (http://crbug.com/512833). 14 // macros/functions defined in ui/gl/gl_bindings.h. (http://crbug.com/512833).
16 typedef unsigned int GLenum; 15 typedef unsigned int GLenum;
17 16
18 namespace cc { 17 namespace cc {
19 18
20 // Keep in sync with arrays below. 19 // Keep in sync with arrays below.
21 enum ResourceFormat { 20 enum ResourceFormat {
22 RGBA_8888, 21 RGBA_8888,
23 RGBA_4444, 22 RGBA_4444,
24 BGRA_8888, 23 BGRA_8888,
25 ALPHA_8, 24 ALPHA_8,
26 LUMINANCE_8, 25 LUMINANCE_8,
27 RGB_565, 26 RGB_565,
28 ETC1, 27 ETC1,
29 RED_8, 28 RED_8,
30 RESOURCE_FORMAT_MAX = RED_8, 29 RESOURCE_FORMAT_MAX = RED_8,
31 }; 30 };
32 31
33 SkColorType ResourceFormatToSkColorType(ResourceFormat format); 32 SkColorType ResourceFormatToSkColorType(ResourceFormat format);
34 33
35 CC_EXPORT int BitsPerPixel(ResourceFormat format); 34 CC_EXPORT int BitsPerPixel(ResourceFormat format);
36 CC_EXPORT GLenum GLDataType(ResourceFormat format); 35 CC_EXPORT GLenum GLDataType(ResourceFormat format);
37 CC_EXPORT GLenum GLDataFormat(ResourceFormat format); 36 CC_EXPORT GLenum GLDataFormat(ResourceFormat format);
38 CC_EXPORT GLenum GLInternalFormat(ResourceFormat format); 37 CC_EXPORT GLenum GLInternalFormat(ResourceFormat format);
39 CC_EXPORT gfx::BufferFormat BufferFormat(ResourceFormat format);
40 38
41 } // namespace cc 39 } // namespace cc
42 40
43 #endif // CC_RESOURCES_RESOURCE_FORMAT_H_ 41 #endif // CC_RESOURCES_RESOURCE_FORMAT_H_
OLDNEW
« no previous file with comments | « cc/raster/tile_task_worker_pool_unittest.cc ('k') | cc/resources/resource_format.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698