diff options
| author | sohan.jyoti <sohan.jyoti@samsung.com> | 2015-03-05 01:14:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-05 09:15:14 +0000 |
| commit | baa78362521106b063a6fc306a8c0f4462c93d02 (patch) | |
| tree | 6519d3794f840c367cc1f051f9bad998405720aa /cc/test/ordered_texture_map.cc | |
| parent | b883726bffad0b1b2e49875c20f1a500e0ff4891 (diff) | |
| download | chromium_src-baa78362521106b063a6fc306a8c0f4462c93d02.zip chromium_src-baa78362521106b063a6fc306a8c0f4462c93d02.tar.gz chromium_src-baa78362521106b063a6fc306a8c0f4462c93d02.tar.bz2 | |
cc: Make ResourceProvider use bindless Produce/ConsumeTextureCHROMIUM
This makes ResourceProvider use ProduceTextureDirectCHROMIUM and
CreateAndConsumeTextureCHROMIUM, and reduce some redundant gl
operations.
BUG=363782
Review URL: https://codereview.chromium.org/635543002
Cr-Commit-Position: refs/heads/master@{#319237}
Diffstat (limited to 'cc/test/ordered_texture_map.cc')
| -rw-r--r-- | cc/test/ordered_texture_map.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cc/test/ordered_texture_map.cc b/cc/test/ordered_texture_map.cc index ee3e2f3..649700c 100644 --- a/cc/test/ordered_texture_map.cc +++ b/cc/test/ordered_texture_map.cc @@ -32,7 +32,10 @@ void OrderedTextureMap::Replace(GLuint id, void OrderedTextureMap::Remove(GLuint id) { TextureMap::iterator map_it = textures_.find(id); - DCHECK(map_it != textures_.end()); + // for some test we generate dummy tex id, which are not registered, + // nothing to remove in that case. + if (map_it == textures_.end()) + return; textures_.erase(map_it); TextureList::iterator list_it = |