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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 1840553002: Revert of Turn on seamless cubemap by default on Desktop GL for ES3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 343
344 if (!group_->feature_info()->gl_version_info().BehavesLikeGLES()) { 344 if (!group_->feature_info()->gl_version_info().BehavesLikeGLES()) {
345 EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE)) 345 EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE))
346 .Times(1) 346 .Times(1)
347 .RetiresOnSaturation(); 347 .RetiresOnSaturation();
348 348
349 EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE)) 349 EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE))
350 .Times(1) 350 .Times(1)
351 .RetiresOnSaturation(); 351 .RetiresOnSaturation();
352 } 352 }
353
354 if (group_->feature_info()->gl_version_info().IsAtLeastGL(3, 2)) {
355 EXPECT_CALL(*gl_, Enable(GL_TEXTURE_CUBE_MAP_SEAMLESS))
356 .Times(1)
357 .RetiresOnSaturation();
358 }
359 353
360 static GLint max_viewport_dims[] = { 354 static GLint max_viewport_dims[] = {
361 kMaxViewportWidth, 355 kMaxViewportWidth,
362 kMaxViewportHeight 356 kMaxViewportHeight
363 }; 357 };
364 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_VIEWPORT_DIMS, _)) 358 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_VIEWPORT_DIMS, _))
365 .WillOnce(SetArrayArgument<1>( 359 .WillOnce(SetArrayArgument<1>(
366 max_viewport_dims, max_viewport_dims + arraysize(max_viewport_dims))) 360 max_viewport_dims, max_viewport_dims + arraysize(max_viewport_dims)))
367 .RetiresOnSaturation(); 361 .RetiresOnSaturation();
368 362
(...skipping 1663 matching lines...) Expand 10 before | Expand all | Expand 10 after
2032 SetupDefaultProgram(); 2026 SetupDefaultProgram();
2033 } 2027 }
2034 2028
2035 // Include the auto-generated part of this file. We split this because it means 2029 // Include the auto-generated part of this file. We split this because it means
2036 // we can easily edit the non-auto generated parts right here in this file 2030 // we can easily edit the non-auto generated parts right here in this file
2037 // instead of having to edit some template or the code generator. 2031 // instead of having to edit some template or the code generator.
2038 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 2032 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
2039 2033
2040 } // namespace gles2 2034 } // namespace gles2
2041 } // namespace gpu 2035 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698