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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.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_context_state.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc
index 3578b5b0bc8f894a419fad4d6d78f8b92c685b93..74149ef24d69e44ba48b65587c6f3b60e3809415 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc
@@ -99,6 +99,7 @@
TEST_P(GLES2DecoderRestoreStateTest, NullPreviousStateBGR) {
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
SetupTexture();
@@ -127,6 +128,7 @@
TEST_P(GLES2DecoderRestoreStateTest, NullPreviousState) {
InitState init;
+ init.gl_version = "3.0";
InitDecoder(init);
SetupTexture();
@@ -151,6 +153,7 @@
TEST_P(GLES2DecoderRestoreStateTest, WithPreviousStateBGR) {
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
SetupTexture();
@@ -175,6 +178,7 @@
TEST_P(GLES2DecoderRestoreStateTest, WithPreviousState) {
InitState init;
+ init.gl_version = "3.0";
InitDecoder(init);
SetupTexture();
@@ -198,6 +202,7 @@
TEST_P(GLES2DecoderRestoreStateTest, ActiveUnit1) {
InitState init;
+ init.gl_version = "3.0";
InitDecoder(init);
// Bind a non-default texture to GL_TEXTURE1 unit.
@@ -228,6 +233,7 @@
TEST_P(GLES2DecoderRestoreStateTest, NonDefaultUnit0BGR) {
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
@@ -266,6 +272,7 @@
TEST_P(GLES2DecoderRestoreStateTest, NonDefaultUnit1BGR) {
InitState init;
+ init.gl_version = "3.0";
init.bind_generates_resource = true;
InitDecoder(init);
@@ -298,6 +305,7 @@
TEST_P(GLES2DecoderRestoreStateTest, DefaultUnit0) {
InitState init;
+ init.gl_version = "3.0";
InitDecoder(init);
// Bind a non-default texture to GL_TEXTURE1 unit.
@@ -334,6 +342,7 @@
TEST_P(GLES2DecoderRestoreStateTest, DefaultUnit1) {
InitState init;
+ init.gl_version = "3.0";
InitDecoder(init);
// Bind a non-default texture to GL_TEXTURE0 unit.
@@ -382,6 +391,7 @@
{0, false, false}};
InitState init;
+ init.gl_version = "2.1";
InitDecoder(init);
for (int i = 0; test[i].gl_enum; i++) {

Powered by Google App Engine
This is Rietveld 408576698