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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.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_drawing.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc
index 957b53bf2e52afb22aefe60f735b439396b0191e..baff3531dab473987fea47959dfd3ec14f5efde4 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc
@@ -391,6 +391,7 @@
TEST_P(GLES2DecoderManualInitTest, DepthEnableWithDepth) {
InitState init;
+ init.gl_version = "3.0";
init.has_depth = true;
init.request_depth = true;
init.bind_generates_resource = true;
@@ -443,6 +444,7 @@
TEST_P(GLES2DecoderManualInitTest, DepthEnableWithoutRequestedDepth) {
InitState init;
+ init.gl_version = "3.0";
init.has_depth = true;
init.bind_generates_resource = true;
InitDecoder(init);
@@ -494,6 +496,7 @@
TEST_P(GLES2DecoderManualInitTest, StencilEnableWithStencil) {
InitState init;
+ init.gl_version = "3.0";
init.has_stencil = true;
init.request_stencil = true;
init.bind_generates_resource = true;
@@ -547,6 +550,7 @@
TEST_P(GLES2DecoderManualInitTest, StencilEnableWithoutRequestedStencil) {
InitState init;
+ init.gl_version = "3.0";
init.has_stencil = true;
init.bind_generates_resource = true;
InitDecoder(init);
@@ -598,6 +602,7 @@
TEST_P(GLES2DecoderManualInitTest, CachedColorMask) {
InitState init;
+ init.gl_version = "3.0";
init.has_alpha = true;
init.has_depth = true;
init.has_stencil = true;
@@ -625,6 +630,7 @@
TEST_P(GLES2DecoderManualInitTest, CachedDepthMask) {
InitState init;
+ init.gl_version = "3.0";
init.has_alpha = true;
init.has_depth = true;
init.has_stencil = true;
@@ -651,6 +657,7 @@
TEST_P(GLES2DecoderManualInitTest, CachedStencilMask) {
InitState init;
+ init.gl_version = "3.0";
init.has_alpha = true;
init.has_depth = true;
init.has_stencil = true;
@@ -739,6 +746,7 @@
// Test that we lose context.
TEST_P(GLES2DecoderManualInitTest, LoseContextWhenOOM) {
InitState init;
+ init.gl_version = "3.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
@@ -855,6 +863,7 @@
switches::kGpuDriverBugWorkarounds,
base::IntToString(gpu::INIT_VERTEX_ATTRIBUTES));
InitState init;
+ init.gl_version = "3.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;

Powered by Google App Engine
This is Rietveld 408576698