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

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

Issue 7158002: Revert 89002 - Enforce RGB even on buggy drivers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "gpu/command_buffer/common/gl_mock.h" 7 #include "gpu/command_buffer/common/gl_mock.h"
8 #include "gpu/command_buffer/common/gles2_cmd_format.h" 8 #include "gpu/command_buffer/common/gles2_cmd_format.h"
9 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 9 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 }; 52 };
53 53
54 template <> 54 template <>
55 void GLES2DecoderTestBase::SpecializedSetup<CheckFramebufferStatus, 0>( 55 void GLES2DecoderTestBase::SpecializedSetup<CheckFramebufferStatus, 0>(
56 bool /* valid */) { 56 bool /* valid */) {
57 DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_, 57 DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_,
58 kServiceFramebufferId); 58 kServiceFramebufferId);
59 }; 59 };
60 60
61 template <> 61 template <>
62 void GLES2DecoderTestBase::SpecializedSetup<Clear, 0>(bool valid) {
63 if (valid) {
64 SetupExpectationsForApplyingDefaultDirtyState();
65 }
66 };
67
68 template <>
69 void GLES2DecoderTestBase::SpecializedSetup<ColorMask, 0>(
70 bool /* valid */) {
71 // We bind a framebuffer color the colormask test since the framebuffer
72 // will be considered RGB.
73 DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_,
74 kServiceFramebufferId);
75 };
76
77 template <>
78 void GLES2DecoderTestBase::SpecializedSetup<CopyTexImage2D, 0>( 62 void GLES2DecoderTestBase::SpecializedSetup<CopyTexImage2D, 0>(
79 bool valid) { 63 bool valid) {
80 if (valid) { 64 if (valid) {
81 EXPECT_CALL(*gl_, GetError()) 65 EXPECT_CALL(*gl_, GetError())
82 .WillOnce(Return(GL_NO_ERROR)) 66 .WillOnce(Return(GL_NO_ERROR))
83 .WillOnce(Return(GL_NO_ERROR)) 67 .WillOnce(Return(GL_NO_ERROR))
84 .RetiresOnSaturation(); 68 .RetiresOnSaturation();
85 } 69 }
86 }; 70 };
87 71
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 .WillOnce(Return(GL_NO_ERROR)) 222 .WillOnce(Return(GL_NO_ERROR))
239 .RetiresOnSaturation(); 223 .RetiresOnSaturation();
240 } 224 }
241 }; 225 };
242 226
243 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" 227 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"
244 228
245 } // namespace gles2 229 } // namespace gles2
246 } // namespace gpu 230 } // namespace gpu
247 231
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698