| 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 "base/basictypes.h" |
| 10 #include "cc/cc_export.h" | 11 #include "cc/cc_export.h" |
| 11 #include "ui/gfx/size.h" | 12 #include "ui/gfx/size.h" |
| 12 #include "third_party/khronos/GLES2/gl2.h" | |
| 13 | 13 |
| 14 namespace cc { | 14 namespace cc { |
| 15 | 15 |
| 16 struct CC_EXPORT Mailbox { | 16 struct CC_EXPORT Mailbox { |
| 17 Mailbox(); | 17 Mailbox(); |
| 18 bool isZero() const; | 18 bool isZero() const; |
| 19 void setName(const GLbyte* name); | 19 void setName(const int8* name); |
| 20 GLbyte name[64]; | 20 int8 name[64]; |
| 21 }; | 21 }; |
| 22 | 22 |
| 23 struct CC_EXPORT TransferableResource { | 23 struct CC_EXPORT TransferableResource { |
| 24 TransferableResource(); | 24 TransferableResource(); |
| 25 ~TransferableResource(); | 25 ~TransferableResource(); |
| 26 | 26 |
| 27 unsigned id; | 27 unsigned id; |
| 28 GLenum format; | 28 uint32 format; |
| 29 GLenum filter; | 29 uint32 filter; |
| 30 gfx::Size size; | 30 gfx::Size size; |
| 31 Mailbox mailbox; | 31 Mailbox mailbox; |
| 32 }; | 32 }; |
| 33 | 33 |
| 34 typedef std::vector<TransferableResource> TransferableResourceArray; | 34 typedef std::vector<TransferableResource> TransferableResourceArray; |
| 35 | 35 |
| 36 struct CC_EXPORT TransferableResourceList { | 36 struct CC_EXPORT TransferableResourceList { |
| 37 TransferableResourceList(); | 37 TransferableResourceList(); |
| 38 ~TransferableResourceList(); | 38 ~TransferableResourceList(); |
| 39 | 39 |
| 40 TransferableResourceArray resources; | 40 TransferableResourceArray resources; |
| 41 unsigned sync_point; | 41 unsigned sync_point; |
| 42 }; | 42 }; |
| 43 | 43 |
| 44 } // namespace cc | 44 } // namespace cc |
| 45 | 45 |
| 46 #endif // CC_TRANSFERABLE_RESOURCE_H_ | 46 #endif // CC_TRANSFERABLE_RESOURCE_H_ |
| OLD | NEW |