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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc

Issue 301793003: During image destroy, delete textures only if we have a GL context. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve android clang dbg build issue. Created 6 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "gpu/command_buffer/common/gles2_cmd_format.h" 9 #include "gpu/command_buffer/common/gles2_cmd_format.h"
10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
(...skipping 2257 matching lines...) Expand 10 before | Expand all | Expand 10 after
2268 EXPECT_TRUE(texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height)); 2268 EXPECT_TRUE(texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height));
2269 // Image should no longer be set. 2269 // Image should no longer be set.
2270 EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL); 2270 EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
2271 } 2271 }
2272 2272
2273 class MockGLImage : public gfx::GLImage { 2273 class MockGLImage : public gfx::GLImage {
2274 public: 2274 public:
2275 MockGLImage() {} 2275 MockGLImage() {}
2276 2276
2277 // Overridden from gfx::GLImage: 2277 // Overridden from gfx::GLImage:
2278 MOCK_METHOD0(Destroy, void());
2279 MOCK_METHOD0(GetSize, gfx::Size()); 2278 MOCK_METHOD0(GetSize, gfx::Size());
2279 MOCK_METHOD1(Destroy, void(bool));
2280 MOCK_METHOD1(BindTexImage, bool(unsigned)); 2280 MOCK_METHOD1(BindTexImage, bool(unsigned));
2281 MOCK_METHOD1(ReleaseTexImage, void(unsigned)); 2281 MOCK_METHOD1(ReleaseTexImage, void(unsigned));
2282 MOCK_METHOD0(WillUseTexImage, void()); 2282 MOCK_METHOD0(WillUseTexImage, void());
2283 MOCK_METHOD0(DidUseTexImage, void()); 2283 MOCK_METHOD0(DidUseTexImage, void());
2284 MOCK_METHOD0(WillModifyTexImage, void()); 2284 MOCK_METHOD0(WillModifyTexImage, void());
2285 MOCK_METHOD0(DidModifyTexImage, void()); 2285 MOCK_METHOD0(DidModifyTexImage, void());
2286 2286
2287 protected: 2287 protected:
2288 virtual ~MockGLImage() {} 2288 virtual ~MockGLImage() {}
2289 }; 2289 };
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
2827 // TODO(gman): CompressedTexSubImage2DImmediate 2827 // TODO(gman): CompressedTexSubImage2DImmediate
2828 2828
2829 // TODO(gman): TexImage2D 2829 // TODO(gman): TexImage2D
2830 2830
2831 // TODO(gman): TexImage2DImmediate 2831 // TODO(gman): TexImage2DImmediate
2832 2832
2833 // TODO(gman): TexSubImage2DImmediate 2833 // TODO(gman): TexSubImage2DImmediate
2834 2834
2835 } // namespace gles2 2835 } // namespace gles2
2836 } // namespace gpu 2836 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/image_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698