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

Side by Side Diff: gpu/command_buffer/tests/es3_misc_functions_unittest.cc

Issue 1499563002: Disable flaky gl tests on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comment. Created 5 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | gpu/command_buffer/tests/gl_ext_srgb_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <GLES2/gl2.h> 5 #include <GLES2/gl2.h>
6 #include <GLES2/gl2ext.h> 6 #include <GLES2/gl2ext.h>
7 #include <GLES2/gl2extchromium.h> 7 #include <GLES2/gl2extchromium.h>
8 #include <GLES3/gl3.h> 8 #include <GLES3/gl3.h>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 14 matching lines...) Expand all
25 command_line.AppendSwitch(switches::kEnableUnsafeES3APIs); 25 command_line.AppendSwitch(switches::kEnableUnsafeES3APIs);
26 GLManager::Options options; 26 GLManager::Options options;
27 options.context_type = gles2::CONTEXT_TYPE_OPENGLES3; 27 options.context_type = gles2::CONTEXT_TYPE_OPENGLES3;
28 gl_.InitializeWithCommandLine(options, &command_line); 28 gl_.InitializeWithCommandLine(options, &command_line);
29 } 29 }
30 void TearDown() override { gl_.Destroy(); } 30 void TearDown() override { gl_.Destroy(); }
31 bool IsApplicable() const { return gl_.IsInitialized(); } 31 bool IsApplicable() const { return gl_.IsInitialized(); }
32 GLManager gl_; 32 GLManager gl_;
33 }; 33 };
34 34
35 TEST_F(OpenGLES3FunctionTest, GetFragDataLocationInvalid) { 35 #if defined(OS_ANDROID)
36 // Test is failing for Lollipop 64 bit Tester.
37 // See crbug/550292.
38 #define MAYBE_GetFragDataLocationInvalid DISABLED_GetFragDataLocationInvalid
39 #else
40 #define MAYBE_GetFragDataLocationInvalid GetFragDataLocationInvalid
41 #endif
42 TEST_F(OpenGLES3FunctionTest, MAYBE_GetFragDataLocationInvalid) {
36 if (!IsApplicable()) { 43 if (!IsApplicable()) {
37 return; 44 return;
38 } 45 }
39 // clang-format off 46 // clang-format off
40 static const char* kVertexShader = 47 static const char* kVertexShader =
41 SHADER_VERSION_300( 48 SHADER_VERSION_300(
42 in vec4 position; 49 in vec4 position;
43 void main() { 50 void main() {
44 gl_Position = position; 51 gl_Position = position;
45 }); 52 });
(...skipping 28 matching lines...) Expand all
74 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError()); 81 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
75 EXPECT_EQ(0, location); 82 EXPECT_EQ(0, location);
76 location = glGetFragDataLocation(program, "Unknown"); 83 location = glGetFragDataLocation(program, "Unknown");
77 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError()); 84 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
78 EXPECT_EQ(-1, location); 85 EXPECT_EQ(-1, location);
79 86
80 glDeleteProgram(program); 87 glDeleteProgram(program);
81 } 88 }
82 89
83 } // namespace gpu 90 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/tests/gl_ext_srgb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698