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

Unified Diff: gpu/command_buffer/service/framebuffer_manager_unittest.cc

Issue 2291753002: Prevent crash when using getExtension while a PBO is bound. (Closed)
Patch Set: work around the fact that a bunch of mocking tests pretend to test ES3 but don't Created 4 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index f1602f92a2dd4ae139ab122bb2b470355c7cbfdf..cae851774921598e9ff094244556bc2b6d402338 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -149,7 +149,7 @@ class FramebufferInfoTestBase : public GpuServiceTest {
void InitializeContext(const char* gl_version, const char* extensions) {
GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
- extensions, "", gl_version);
+ extensions, "", gl_version, manager_.context_type());
feature_info_->InitializeForTesting();
decoder_.reset(new MockGLES2Decoder());
manager_.CreateFramebuffer(kClient1Id, kService1Id);
@@ -1554,7 +1554,7 @@ class FramebufferInfoES3Test : public FramebufferInfoTestBase {
void InitializeContext(const char* gl_version, const char* extensions) {
GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
- extensions, "", gl_version);
+ extensions, "", gl_version, manager_.context_type());
feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3);
decoder_.reset(new MockGLES2Decoder());
manager_.CreateFramebuffer(kClient1Id, kService1Id);

Powered by Google App Engine
This is Rietveld 408576698