Skip to content

Commit

Permalink
Revert "Redo GL/ES driver version detection."
Browse files Browse the repository at this point in the history 
This reverts commit 34cc115.
Originally reviewed at: https://chromium-review.googlesource.com/c/chromium/src/+/1065191

Broke Nexus 6 FYI bot:
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Android%20FYI%20Release%20(Nexus%206)/4593

TBR=piman@chromium.org

Bug: 839609,839618
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ic4ebaedc578f8b32a5a423b73d2b7e29911c791c
Reviewed-on: https://chromium-review.googlesource.com/1067135
Commit-Queue: James Darpinian <jdarpinian@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560252}
  • Loading branch information
@jdarpinian
jdarpinian authored and Commit Bot committed May 21, 2018
1 parent 9865603 commit 7f3a0a7
Show file tree
Hide file tree
Showing 24 changed files with 392 additions and 231 deletions.
14 changes: 7 additions & 7 deletions gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateInvalidArgs) {
TEST_P(GLES2DecoderManualInitTest, BeginEndQueryEXT) {
InitState init;
init.extensions = "GL_EXT_occlusion_query_boolean";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down Expand Up @@ -696,7 +696,7 @@ static void CheckBeginEndQueryBadMemoryFails(GLES2DecoderTestBase* test,
init.extensions = "GL_EXT_occlusion_query_boolean"
" GL_ARB_sync"
" GL_ARB_timer_query";
init.gl_version = "OpenGL ES 3.0";
init.gl_version = "opengl es 3.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down Expand Up @@ -749,7 +749,7 @@ TEST_P(GLES2DecoderManualInitTest, QueryReuseTest) {
init.extensions = "GL_EXT_occlusion_query_boolean"
" GL_ARB_sync"
" GL_ARB_timer_query";
init.gl_version = "OpenGL ES 3.0";
init.gl_version = "opengl es 3.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down Expand Up @@ -884,7 +884,7 @@ TEST_P(GLES2DecoderTest, SetDisjointValueSync) {
TEST_P(GLES2DecoderManualInitTest, BeginEndQueryEXTCommandsCompletedCHROMIUM) {
InitState init;
init.extensions = "GL_EXT_occlusion_query_boolean GL_ARB_sync";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down Expand Up @@ -956,7 +956,7 @@ TEST_P(GLES2DecoderManualInitTest, BeginEndQueryEXTCommandsCompletedCHROMIUM) {
TEST_P(GLES2DecoderManualInitTest, BeginInvalidTargetQueryFails) {
InitState init;
init.extensions = "";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down Expand Up @@ -994,7 +994,7 @@ TEST_P(GLES2DecoderManualInitTest, BeginInvalidTargetQueryFails) {
TEST_P(GLES2DecoderManualInitTest, QueryCounterEXTTimeStamp) {
InitState init;
init.extensions = "GL_ARB_timer_query";
init.gl_version = "OpenGL ES 3.0";
init.gl_version = "opengl es 3.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down Expand Up @@ -1027,7 +1027,7 @@ TEST_P(GLES2DecoderManualInitTest, QueryCounterEXTTimeStamp) {
TEST_P(GLES2DecoderManualInitTest, InvalidTargetQueryCounterFails) {
InitState init;
init.extensions = "";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest {

void SetUp() override {
InitState init;
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.bind_generates_resource = true;
InitDecoder(init);
SetupDefaultProgram();
Expand Down
4 changes: 2 additions & 2 deletions gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_lost.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class GLES2DecoderLostContextTest : public GLES2DecoderManualInitTest {
protected:
void Init(bool has_robustness) {
InitState init;
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
if (has_robustness)
init.extensions = "GL_KHR_robustness";
InitDecoder(init);
Expand All @@ -112,7 +112,7 @@ class GLES2DecoderLostContextTest : public GLES2DecoderManualInitTest {
gpu::GpuDriverBugWorkarounds workarounds;
workarounds.use_virtualized_gl_contexts = true;
InitState init;
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.extensions = "GL_KHR_robustness";
InitDecoderWithWorkarounds(init, workarounds);
}
Expand Down
4 changes: 2 additions & 2 deletions gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2057,7 +2057,7 @@ TEST_P(GLES2DecoderWithShaderTest, DrawClearsAfterRenderbufferStorageInFBO) {

TEST_P(GLES2DecoderManualInitTest, DrawArraysClearsAfterTexImage2DNULLCubemap) {
InitState init;
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand Down Expand Up @@ -2256,7 +2256,7 @@ TEST_P(GLES2DecoderWithShaderTest,
TEST_P(GLES2DecoderManualInitTest, DrawClearsDepthTexture) {
InitState init;
init.extensions = "GL_ANGLE_depth_texture";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand Down
14 changes: 7 additions & 7 deletions gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class GLES2DecoderTestWithCHROMIUMPathRendering : public GLES2DecoderTest {

void SetUp() override {
InitState init;
init.gl_version = "OpenGL ES 3.1";
init.gl_version = "opengl es 3.1";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand Down Expand Up @@ -485,7 +485,7 @@ class GLES2DecoderTestWithBlendEquationAdvanced : public GLES2DecoderTest {
GLES2DecoderTestWithBlendEquationAdvanced() = default;
void SetUp() override {
InitState init;
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand All @@ -507,7 +507,7 @@ class GLES2DecoderTestWithEXTMultisampleCompatibility

void SetUp() override {
InitState init;
init.gl_version = "OpenGL ES 3.1";
init.gl_version = "opengl es 3.1";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand All @@ -526,7 +526,7 @@ class GLES2DecoderTestWithBlendFuncExtended : public GLES2DecoderTest {
GLES2DecoderTestWithBlendFuncExtended() = default;
void SetUp() override {
InitState init;
init.gl_version = "OpenGL ES 3.0";
init.gl_version = "opengl es 3.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand All @@ -546,7 +546,7 @@ class GLES2DecoderTestWithCHROMIUMFramebufferMixedSamples
GLES2DecoderTestWithCHROMIUMFramebufferMixedSamples() = default;
void SetUp() override {
InitState init;
init.gl_version = "OpenGL ES 3.1";
init.gl_version = "opengl es 3.1";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand Down Expand Up @@ -1729,7 +1729,7 @@ class GLES2DecoderTestWithCHROMIUMRasterTransport : public GLES2DecoderTest {
GLES2DecoderTestWithCHROMIUMRasterTransport() = default;
void SetUp() override {
InitState init;
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand All @@ -1750,7 +1750,7 @@ class GLES3DecoderTestWithEXTWindowRectangles : public GLES3DecoderTest {
void SetUp() override {
InitState init;
init.context_type = CONTEXT_TYPE_OPENGLES3;
init.gl_version = "OpenGL ES 3.0";
init.gl_version = "opengl es 3.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand Down
22 changes: 11 additions & 11 deletions gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class GLES2DecoderTestWithExtensionsOnGLES2 : public GLES2DecoderTest {
void Init(const char* extensions) {
InitState init;
init.extensions = extensions;
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.has_depth = true;
init.request_alpha = true;
Expand Down Expand Up @@ -1259,7 +1259,7 @@ TEST_P(GLES2DecoderTest, ReadPixelsInvalidArgs) {
TEST_P(GLES2DecoderManualInitTest, ReadPixelsAsyncError) {
InitState init;
init.extensions = "GL_ARB_sync";
init.gl_version = "OpenGL ES 3.0";
init.gl_version = "opengl es 3.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down Expand Up @@ -1314,7 +1314,7 @@ class GLES2ReadPixelsAsyncTest : public GLES2DecoderManualInitTest {
void SetUp() override {
InitState init;
init.extensions = "GL_ARB_sync";
init.gl_version = "OpenGL ES 3.0";
init.gl_version = "opengl es 3.0";
init.has_alpha = true;
init.request_alpha = true;
init.bind_generates_resource = true;
Expand Down Expand Up @@ -1779,7 +1779,7 @@ TEST_P(GLES2DecoderManualInitTest, ActualStencilDoesNotMatchRequestedStencil) {
TEST_P(GLES2DecoderManualInitTest, PackedDepthStencilReportsCorrectValues) {
InitState init;
init.extensions = "GL_OES_packed_depth_stencil";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_depth = true;
init.has_stencil = true;
init.request_depth = true;
Expand Down Expand Up @@ -1821,7 +1821,7 @@ TEST_P(GLES2DecoderManualInitTest, PackedDepthStencilReportsCorrectValues) {
TEST_P(GLES2DecoderManualInitTest, PackedDepthStencilNoRequestedStencil) {
InitState init;
init.extensions = "GL_OES_packed_depth_stencil";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_depth = true;
init.has_stencil = true;
init.request_depth = true;
Expand Down Expand Up @@ -1862,7 +1862,7 @@ TEST_P(GLES2DecoderManualInitTest, PackedDepthStencilNoRequestedStencil) {
TEST_P(GLES2DecoderManualInitTest, PackedDepthStencilRenderbufferDepth) {
InitState init;
init.extensions = "GL_OES_packed_depth_stencil";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.bind_generates_resource = true;
InitDecoder(init);
DoBindRenderbuffer(
Expand Down Expand Up @@ -1932,7 +1932,7 @@ TEST_P(GLES2DecoderManualInitTest, PackedDepthStencilRenderbufferDepth) {
TEST_P(GLES2DecoderManualInitTest, PackedDepthStencilRenderbufferStencil) {
InitState init;
init.extensions = "GL_OES_packed_depth_stencil";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.bind_generates_resource = true;
InitDecoder(init);
DoBindRenderbuffer(
Expand Down Expand Up @@ -3295,7 +3295,7 @@ TEST_P(GLES2DecoderTest, DrawBuffersEXTMainFramebuffer) {

TEST_P(GLES2DecoderManualInitTest, InvalidateFramebufferBinding) {
InitState init;
init.gl_version = "OpenGL ES 3.0";
init.gl_version = "opengl es 3.0";
InitDecoder(init);

// EXPECT_EQ can't be used to compare function pointers
Expand Down Expand Up @@ -3346,7 +3346,7 @@ TEST_P(GLES2DecoderTest, ClearBackbufferBitsOnFlipSwap) {
TEST_P(GLES2DecoderManualInitTest, DiscardFramebufferEXT) {
InitState init;
init.extensions = "GL_EXT_discard_framebuffer";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
InitDecoder(init);

// EXPECT_EQ can't be used to compare function pointers
Expand Down Expand Up @@ -3389,7 +3389,7 @@ TEST_P(GLES2DecoderManualInitTest, DiscardFramebufferEXT) {
TEST_P(GLES2DecoderManualInitTest, ClearBackbufferBitsOnDiscardFramebufferEXT) {
InitState init;
init.extensions = "GL_EXT_discard_framebuffer";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
InitDecoder(init);

// EXPECT_EQ can't be used to compare function pointers.
Expand Down Expand Up @@ -3550,7 +3550,7 @@ TEST_P(GLES2DecoderManualInitTest,
DiscardedAttachmentsEXTMarksFramebufferIncomplete) {
InitState init;
init.extensions = "GL_EXT_discard_framebuffer";
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.has_alpha = true;
init.bind_generates_resource = true;
InitDecoder(init);
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ TEST_P(GLES2DecoderManualInitTest, GetShaderPrecisionFormatSucceeds) {
// Force ES underlying implementation to ensure we check the shader precision
// format.
InitState init;
init.gl_version = "OpenGL ES 2.0";
init.gl_version = "opengl es 2.0";
init.bind_generates_resource = true;
InitDecoder(init);

Expand Down
Loading

0 comments on commit 7f3a0a7

Please sign in to comment.