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

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

Issue 1488313002: gpu: enable FRAMBUFFER_SRGB on desktop Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no change 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 | « 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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 if (!group_->feature_info()->gl_version_info().BehavesLikeGLES()) { 336 if (!group_->feature_info()->gl_version_info().BehavesLikeGLES()) {
337 EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE)) 337 EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE))
338 .Times(1) 338 .Times(1)
339 .RetiresOnSaturation(); 339 .RetiresOnSaturation();
340 340
341 EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE)) 341 EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE))
342 .Times(1) 342 .Times(1)
343 .RetiresOnSaturation(); 343 .RetiresOnSaturation();
344 } 344 }
345 345
346 if (!group_->feature_info()->gl_version_info().is_es &&
347 group_->feature_info()->feature_flags().ext_framebuffer_srgb) {
348 EXPECT_CALL(*gl_, Enable(GL_FRAMEBUFFER_SRGB))
349 .Times(1)
350 .RetiresOnSaturation();
351 }
352
346 static GLint max_viewport_dims[] = { 353 static GLint max_viewport_dims[] = {
347 kMaxViewportWidth, 354 kMaxViewportWidth,
348 kMaxViewportHeight 355 kMaxViewportHeight
349 }; 356 };
350 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_VIEWPORT_DIMS, _)) 357 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_VIEWPORT_DIMS, _))
351 .WillOnce(SetArrayArgument<1>( 358 .WillOnce(SetArrayArgument<1>(
352 max_viewport_dims, max_viewport_dims + arraysize(max_viewport_dims))) 359 max_viewport_dims, max_viewport_dims + arraysize(max_viewport_dims)))
353 .RetiresOnSaturation(); 360 .RetiresOnSaturation();
354 361
355 static GLfloat line_width_range[] = { 1.0f, 2.0f }; 362 static GLfloat line_width_range[] = { 1.0f, 2.0f };
(...skipping 1582 matching lines...) Expand 10 before | Expand all | Expand 10 after
1938 SetupDefaultProgram(); 1945 SetupDefaultProgram();
1939 } 1946 }
1940 1947
1941 // Include the auto-generated part of this file. We split this because it means 1948 // Include the auto-generated part of this file. We split this because it means
1942 // we can easily edit the non-auto generated parts right here in this file 1949 // we can easily edit the non-auto generated parts right here in this file
1943 // instead of having to edit some template or the code generator. 1950 // instead of having to edit some template or the code generator.
1944 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 1951 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
1945 1952
1946 } // namespace gles2 1953 } // namespace gles2
1947 } // namespace gpu 1954 } // 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