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

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

Issue 12542009: Revert "Revert 186416" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
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.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "gpu/command_buffer/common/gles2_cmd_format.h" 7 #include "gpu/command_buffer/common/gles2_cmd_format.h"
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
10 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 10 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 if (valid) { 142 if (valid) {
143 EXPECT_CALL(*gl_, GetError()) 143 EXPECT_CALL(*gl_, GetError())
144 .WillOnce(Return(GL_NO_ERROR)) 144 .WillOnce(Return(GL_NO_ERROR))
145 .WillOnce(Return(GL_NO_ERROR)) 145 .WillOnce(Return(GL_NO_ERROR))
146 .RetiresOnSaturation(); 146 .RetiresOnSaturation();
147 } 147 }
148 }; 148 };
149 149
150 template <> 150 template <>
151 void GLES2DecoderTestBase::SpecializedSetup< 151 void GLES2DecoderTestBase::SpecializedSetup<
152 cmds::GetBufferParameteriv, 0>(bool /* valid */) {
153 DoBindBuffer(GL_ARRAY_BUFFER, client_buffer_id_, kServiceBufferId);
154 };
155
156 template <>
157 void GLES2DecoderTestBase::SpecializedSetup<
152 cmds::GetFramebufferAttachmentParameteriv, 0>(bool /* valid */) { 158 cmds::GetFramebufferAttachmentParameteriv, 0>(bool /* valid */) {
153 DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_, 159 DoBindFramebuffer(GL_FRAMEBUFFER, client_framebuffer_id_,
154 kServiceFramebufferId); 160 kServiceFramebufferId);
155 }; 161 };
156 162
157 template <> 163 template <>
158 void GLES2DecoderTestBase::SpecializedSetup< 164 void GLES2DecoderTestBase::SpecializedSetup<
159 cmds::GetRenderbufferParameteriv, 0>( 165 cmds::GetRenderbufferParameteriv, 0>(
160 bool /* valid */) { 166 bool /* valid */) {
161 DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_, 167 DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 .WillOnce(Return(GL_NO_ERROR)) 260 .WillOnce(Return(GL_NO_ERROR))
255 .RetiresOnSaturation(); 261 .RetiresOnSaturation();
256 } 262 }
257 }; 263 };
258 264
259 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" 265 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"
260 266
261 } // namespace gles2 267 } // namespace gles2
262 } // namespace gpu 268 } // namespace gpu
263 269
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698