OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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_TRANSFERABLE_RESOURCE_H_ | 5 #ifndef CC_TRANSFERABLE_RESOURCE_H_ |
6 #define CC_TRANSFERABLE_RESOURCE_H_ | 6 #define CC_TRANSFERABLE_RESOURCE_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "cc/cc_export.h" | 10 #include "cc/cc_export.h" |
11 #include "ui/gfx/size.h" | 11 #include "ui/gfx/size.h" |
12 #include "third_party/khronos/GLES2/gl2.h" | 12 #include "third_party/khronos/GLES2/gl2.h" |
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorTransf
erableResourceList.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorTransf
erableResourceList.h" |
14 | 14 |
15 namespace cc { | 15 namespace cc { |
16 | 16 |
17 struct Mailbox { | 17 struct Mailbox { |
18 Mailbox(); | 18 Mailbox(); |
19 bool isZero() const; | 19 bool isZero() const; |
20 void setName(const GLbyte* name); | 20 void setName(const GLbyte* name); |
21 GLbyte name[64]; | 21 GLbyte name[64]; |
22 }; | 22 }; |
23 | 23 |
24 struct CC_EXPORT TransferableResource { | 24 struct CC_EXPORT TransferableResource { |
25 TransferableResource(); | 25 TransferableResource(); |
26 ~TransferableResource(); | 26 ~TransferableResource(); |
27 | 27 |
28 unsigned id; | 28 unsigned id; |
29 GLenum format; | 29 GLenum format; |
| 30 GLenum minFilter; |
| 31 GLenum magFilter; |
30 gfx::Size size; | 32 gfx::Size size; |
31 Mailbox mailbox; | 33 Mailbox mailbox; |
32 }; | 34 }; |
33 | 35 |
34 typedef std::vector<TransferableResource> TransferableResourceArray; | 36 typedef std::vector<TransferableResource> TransferableResourceArray; |
35 | 37 |
36 struct CC_EXPORT TransferableResourceList : | 38 struct CC_EXPORT TransferableResourceList : |
37 public NON_EXPORTED_BASE(WebKit::WebCompositorTransferableResourceList) { | 39 public NON_EXPORTED_BASE(WebKit::WebCompositorTransferableResourceList) { |
38 TransferableResourceList(); | 40 TransferableResourceList(); |
39 ~TransferableResourceList(); | 41 ~TransferableResourceList(); |
40 | 42 |
41 TransferableResourceArray resources; | 43 TransferableResourceArray resources; |
42 unsigned sync_point; | 44 unsigned sync_point; |
43 }; | 45 }; |
44 | 46 |
45 } // namespace cc | 47 } // namespace cc |
46 | 48 |
47 #endif // CC_TRANSFERABLE_RESOURCE_H_ | 49 #endif // CC_TRANSFERABLE_RESOURCE_H_ |
OLD | NEW |