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

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

Issue 893213002: Revert of Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/gles2_cmd_decoder_unittest.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 905a390b4f922c324a0f74eb89dbc4b9b5545554..8794e422f59e33050962061bf3f74fe357bbdb21 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -62,6 +62,7 @@
switches::kGpuDriverBugWorkarounds,
base::IntToString(gpu::CLEAR_ALPHA_IN_READPIXELS));
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoderWithCommandLine(init, &command_line);
SetupDefaultProgram();
@@ -267,6 +268,7 @@
TEST_P(GLES2DecoderManualInitTest, BindGeneratesResourceFalse) {
InitState init;
+ init.gl_version = "3.0";
InitDecoder(init);
BindTexture cmd1;
@@ -702,6 +704,7 @@
TEST_P(GLES2DecoderManualInitTest, GpuMemoryManagerCHROMIUM) {
InitState init;
init.extensions = "GL_ARB_texture_rectangle";
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
@@ -777,6 +780,7 @@
new SizeOnlyMemoryTracker();
set_memory_tracker(memory_tracker.get());
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
// Expect that initial size - size is 0.
@@ -789,6 +793,7 @@
new SizeOnlyMemoryTracker();
set_memory_tracker(memory_tracker.get());
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
@@ -845,6 +850,7 @@
new SizeOnlyMemoryTracker();
set_memory_tracker(memory_tracker.get());
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
@@ -871,6 +877,7 @@
new SizeOnlyMemoryTracker();
set_memory_tracker(memory_tracker.get());
InitState init;
+ init.gl_version = "3.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
@@ -907,6 +914,7 @@
new SizeOnlyMemoryTracker();
set_memory_tracker(memory_tracker.get());
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
DoBindRenderbuffer(
@@ -942,6 +950,7 @@
new SizeOnlyMemoryTracker();
set_memory_tracker(memory_tracker.get());
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId);
@@ -980,6 +989,7 @@
const GLint kBorder = 0;
InitState init;
init.extensions = "GL_EXT_texture_storage";
+ init.gl_version = "3.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;

Powered by Google App Engine
This is Rietveld 408576698