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

Unified Diff: gpu/command_buffer/service/program_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/program_manager_unittest.cc
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index e9840e97a5512d63ccecf3d215e3504e6cca4767..b37384f6964bce9ffd90fe380b0503d0dd7ac73a 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -70,8 +70,12 @@ class ProgramManagerTestBase : public GpuServiceTest {
const char* gl_extensions,
FeatureInfo* feature_info = nullptr) {
GpuServiceTest::SetUpWithGLVersion(gl_version, gl_extensions);
+ ContextType context_type = CONTEXT_TYPE_OPENGLES2;
+ if (feature_info) {
Zhenyao Mo 2016/08/31 00:15:19 nit: You can move if (!feature_info) feature_info
Kai Ninomiya 2016/08/31 00:47:59 Done (not yet uploaded).
+ context_type = feature_info->context_type();
+ }
TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
- gl_.get(), gl_extensions, "", gl_version);
+ gl_.get(), gl_extensions, "", gl_version, context_type);
if (!feature_info)
feature_info = new FeatureInfo();
feature_info->InitializeForTesting();

Powered by Google App Engine
This is Rietveld 408576698