| Index: gpu/command_buffer/service/texture_definition.h
|
| diff --git a/gpu/command_buffer/service/texture_definition.h b/gpu/command_buffer/service/texture_definition.h
|
| index dcab0b8455fee295f0a0c23ae6139b8864a8212a..95f0fa2e05866b89bf13bb5571df97ab72c57ae2 100644
|
| --- a/gpu/command_buffer/service/texture_definition.h
|
| +++ b/gpu/command_buffer/service/texture_definition.h
|
| @@ -61,7 +61,6 @@ class TextureDefinition {
|
| bool SafeToRenderFrom() const;
|
|
|
| struct LevelInfo {
|
| - LevelInfo();
|
| LevelInfo(GLenum target,
|
| GLenum internal_format,
|
| GLsizei width,
|
| @@ -84,6 +83,8 @@ class TextureDefinition {
|
| bool cleared;
|
| };
|
|
|
| + typedef std::vector<std::vector<LevelInfo> > LevelInfos;
|
| +
|
| unsigned int version_;
|
| GLenum target_;
|
| scoped_refptr<NativeImageBuffer> image_buffer_;
|
| @@ -93,10 +94,7 @@ class TextureDefinition {
|
| GLenum wrap_t_;
|
| GLenum usage_;
|
| bool immutable_;
|
| - bool defined_;
|
| -
|
| - // Only support textures with one face and one level.
|
| - LevelInfo level_info_;
|
| + LevelInfos level_infos_;
|
| };
|
|
|
| } // namespage gles2
|
|
|