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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/service/texture_definition.h

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix gn for nacl Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/shader_manager.cc ('k') | gpu/command_buffer/service/texture_definition.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 95f0fa2e05866b89bf13bb5571df97ab72c57ae2..dcab0b8455fee295f0a0c23ae6139b8864a8212a 100644
--- a/gpu/command_buffer/service/texture_definition.h
+++ b/gpu/command_buffer/service/texture_definition.h
@@ -61,6 +61,7 @@ class TextureDefinition {
bool SafeToRenderFrom() const;
struct LevelInfo {
+ LevelInfo();
LevelInfo(GLenum target,
GLenum internal_format,
GLsizei width,
@@ -83,8 +84,6 @@ class TextureDefinition {
bool cleared;
};
- typedef std::vector<std::vector<LevelInfo> > LevelInfos;
-
unsigned int version_;
GLenum target_;
scoped_refptr<NativeImageBuffer> image_buffer_;
@@ -94,7 +93,10 @@ class TextureDefinition {
GLenum wrap_t_;
GLenum usage_;
bool immutable_;
- LevelInfos level_infos_;
+ bool defined_;
+
+ // Only support textures with one face and one level.
+ LevelInfo level_info_;
};
} // namespage gles2
« no previous file with comments | « gpu/command_buffer/service/shader_manager.cc ('k') | gpu/command_buffer/service/texture_definition.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698